[automerger skipped] Merge 10952656 am: eaffdb27 -s ours am: f5071236 -s...

[automerger skipped] Merge 10952656 am: eaffdb27 -s ours am: f5071236 -s ours am: e0943f55 -s ours am: b576f420 -s ours

am skip reason: Merged-In Ied62557243b12be4a72e9a374e9450309f92cee0 with SHA-1 b6fb0696 is already in history

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



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