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

[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: f188b54f am: c6f06115 -s ours am: 4ee49cb0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib76867336abd92b5cb0c7c67f1a21a0d125035f6