Merge changes I03e7cda7,I675c4ef5 am: af7101ff0f

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

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