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

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

Change-Id: I61ed3eabd942af24f499605cfe5c5b9c883bfe7a