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

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

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