Merge changes Ie826477d,I5125a3ac am: f8ed984e9c am: c08c9c8d96 am: dc86ef31c6

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

Change-Id: I10f20f83cce1f110bf17aca840b009dae36f3984