[automerger skipped] Merge Android 12L am: f08c6c060f -s ours

am skip reason: Merged-In I03636e6b8b4dc200fcb039b99190759bc7d5e776 with SHA-1 3acad24476 is already in history

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

Change-Id: I9c2e2f8364c885b83222a18f9ff67410e36b76df