[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: 1f02491f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I66305d68161f2bef632a40b2cea4add6e7cd13f4