Merge changes I5af6ce96,Ibc1f6813 am: 3938102448

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

Change-Id: I387852c0c1d451f0308bfd1cf683c80eae897efe