[automerger skipped] Merge Android 12 am: 301d6bdfa6 -s ours am: 0d63d026fb -s ours am: 04c7ac4727 -s ours

am skip reason: Merged-In I3ae21d9b034e455ba48d9576712a102ccda0f647 with SHA-1 6e1c375f50 is already in history

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

Change-Id: I5cc467ca5619603f383edbe7e0dc6cacc0a5e16d