Merge "follow up aosp/2600007" am: dc8df135cb am: 957d205a59 am: 8692a5ac35 am: b70f0a5dfb

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

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