[automerger skipped] Merge Android U (ab/10368041) am: 4a6c653160 -s ours

am skip reason: Merged-In Iff29b090c0b41d0103997a80788f09c2602df074 with SHA-1 efd7a3e313 is already in history

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

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