[automerger skipped] Empty Merge Android U (ab/10368041) am: fd84421e -s...

[automerger skipped] Empty Merge Android U (ab/10368041) am: fd84421e -s ours am: f11fcdfc -s ours am: 0b0184b9 -s ours am: 959c953c -s ours am: 43b54906 -s ours

am skip reason: Merged-In Id7af1499a3b15b86989fb0b028ea802090a80e7c with SHA-1 48820d30 is already in history

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



Change-Id: I910837573c184156ff32dfe940e9661551cd9013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>