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

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

Change-Id: I4fabf511654dec52ffe064365520827e6cb2e89b