Merge changes I5eaeb415,I236f1550 am: 7d180e679a

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

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