[automerger skipped] [automerged blank] [DO NOT MERGE] Placeholder to avoid...

[automerger skipped] [automerged blank] [DO NOT MERGE] Placeholder to avoid using quiche 0.17.1 2p: 66383f37 am: af58965d am: 0a7deca1 -s ours

am skip reason: subject contains skip directive

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



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