Merge changes I5af6ce96,Ibc1f6813 am: 3938102448 am: 6ae67599f1 am: f2c84e7d75

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

Change-Id: I9658059f95e6b5f099c2de72b9b52e3e0868ed71