[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: c4e5b931 -s ours am: aa947e49 -s ours am: 12716619 -s ours

am skip reason: Merged-In Ic58e3efec934d2a71828819f7fd818973dc27c5f with SHA-1 5576d8fd is already in history

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

Change-Id: I8369227fc44ad05ad83fb0512955faed117d2a52