[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master am: 786410e079 -s ours am: 8d1d8423b5 -s ours

am skip reason: Merged-In I007dfcac3759ed90a91e67614bb952a6986ad6df with SHA-1 444446bc34 is already in history

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

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