Merge changes Ie68356a4,I2b63c24b am: d6a5303cd8 am: 93765193d3 am: 3abcd3ef99

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

Change-Id: I301038da28247f4876234733a09cd216f3daa1d7