[automerger skipped] Merge "Merge Android 12" am: 90701d2b -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: 90701d2b -s ours am: ec3de2bc -s ours am: a2fccc24 -s ours am: d61a2423 -s ours

am skip reason: Merged-In I382fd7706a9050c786cc1a3735c7a5864dc1bd04 with SHA-1 5c3fbfc5 is already in history

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

Change-Id: I39b2ba1ec4bd6f13fcd7df3513dcd9fb5e83db25