[automerger skipped] Merge "RESTRICT AUTOMERGE placeholder to avoid merge conflict" into mainline-prod am: d0c7fa36 -s ours am: 98391832

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5501931a27a6ba54d4e74755b493270f8c3c44b8