[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE...

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: e9669125 am: 8588cea0 -s ours am: c56e48d1 -s ours

am skip reason: Change-Id If5288d5ec76e6295dbba5d65185cdf1bc6e9e87e with SHA-1 7047ae7b is in history

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

Change-Id: I3bf54293ccd0f171a11e93c24de4a5c42590b2fd