Merge changes I987ab866,I73fa9ca7 am: e4407fb469

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

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