[automerger skipped] Merge "Enable mainline-presubmit for DnsResolver" am:...

[automerger skipped] Merge "Enable mainline-presubmit for DnsResolver" am: 914656b6 am: 5e1cbd5b -s ours am: 0a82238d -s ours am: 7d985fa7 -s ours am: fb5f6913 -s ours

am skip reason: Change-Id I157e951d67a45970b5a61922afd21592976c929f with SHA-1 46799394 is in history

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

Change-Id: Ied75573a857c693d82ce8963686c8846934c54f9