[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 207fdc7ebd -s ours am: 191dd41452 -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: I24d8974078cf75299e55660247f41d8de2dd40e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>