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

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

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