[automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master -...

[automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE am: 66368cbe -s ours am: 28ace420 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia422af1def3b2eb486ee02ef5e4604c546b16139