[automerger skipped] Merge "Merge Android 12 QPR 3" am: 4cea149d66 -s ours

am skip reason: Merged-In I8d79f3a4c2de564e193d41aae1ff72ba9b12114d with SHA-1 2418c8745f is already in history

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

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