Merge changes I28429c92,Ibb0cc4c8 am: c916f3dafe

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

Change-Id: Ifcef736cd55d3617d0d7645ce7e4927adcc91f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>