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

am skip reason: subject contains skip directive

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

Change-Id: I51cbe14c7db802e0070e987fe68ddf29c68d67ac