Merge changes Iad0b0d52,Iee727308 am: 6eb0654f9b am: 27f85f972f am: 199d977828

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

Change-Id: I238821336dbafc645bb45407805664f21241de22