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

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

Change-Id: If1091374af5d36a2caab113a35166b2b9be65f64