Merge changes Iafa8979d,I44eac159,I27ad3298 am: 6097358382

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

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