Merge changes Ib8fe719f,Ia8c05780 am: 7648833bd4

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

Change-Id: Ia8ff14142da45de950d2bac507ed5b943d81533e