[automerger skipped] Merge Android R am: 333377b4 -s ours am: 8fe29f90 -s...

[automerger skipped] Merge Android R am: 333377b4 -s ours am: 8fe29f90 -s ours am: 39d2bed8 -s ours

am skip reason: Change-Id I84f04ecdd900ae5f77f409c8b325f9a447afb8a3 with SHA-1 9a057c71 is in history

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

Change-Id: I14e829d7ab52f633e85056cd828b63a5ff610825