Merge changes Ie68356a4,I2b63c24b am: d6a5303cd8 am: 57ede0f8c1

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

Change-Id: I0efab4e5c3d39e3f4fcb5d799f5ce994b61c5731