Merge changes I5af6ce96,Ibc1f6813 am: 3938102448

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

Change-Id: Ib299b5e06a01435b7f7e36486346cd198a026b21