[automerger skipped] Merge Android R...

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: a2cccc09 -s ours am: 54d8bfb0 -s ours

am skip reason: Change-Id I007b22e4466e202817dc600631817899535b33d7 with SHA-1 5ad5e92f is in history

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

Change-Id: I7607fcf845b7e46839c9f9d09faf681a8a4228bf