Merge changes I987ab866,I73fa9ca7 am: e4407fb469 am: 09a2116456

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

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