Merge changes Ib1cd342a,Iab23d414 am: 1c5ce5542a am: f105588f91 am: 41c0fb173a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1991622

Change-Id: Iba6cbad6fed693465dd494e40c43f2c70c452ff4