[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO...

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: bcd90798 -s ours am: 9565e8ce -s ours am: 73ba4bb1 -s ours

am skip reason: Change-Id I621749fd6b3722efccd481e647d69768048a2c18 with SHA-1 a00743f8 is in history

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

Change-Id: I905f63e23ae66c3136d0fe37cf69f4082491c3fb