[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622"...

[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 3b12bc1f -s ours am: 56801f95 -s ours am: ffd80b74 -s ours

am skip reason: Merged-In Iab535f4e2c9ba5017e9ee2e112ff20059e7f401b with SHA-1 f5e650b6 is already in history

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

Change-Id: I948e38229ee749fe3b32cb71e948bba34ca8cafa