[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am:...

[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ab04ecf5 am: 1bbf8547 -s ours

am skip reason: Merged-In I6d7590eb6e7b077d4fd10868ce4628aabc3bf1f8 with SHA-1 8872548f is already in history

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



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