Merge changes I03e7cda7,I675c4ef5 am: af7101ff0f

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

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