[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: 96c259d0 -s ours

am skip reason: Change-Id Ic84addeaf573721661c5ca3f4c7811a00a8ed533 with SHA-1 23267e4b is in history

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

Change-Id: I43a7c8d66795ae332deff2212137c0181c6269d1