[automerger skipped] Merge "Merge Android 12 QPR1" am: 93c578c7ca -s ours

am skip reason: skipped by user delphij

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

Change-Id: I770300f1d0bfb47b09d6eb8b3ea6fdba78739592