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

am skip reason: skipped by user delphij

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

Change-Id: If59909b2107c22083c1b99339c1c0415ace59246