Merge changes I987ab866,I73fa9ca7 am: e4407fb469

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

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