[automerger skipped] Merge "[DO NOT MERGE] Placeholder to avoid using quiche...

[automerger skipped] Merge "[DO NOT MERGE] Placeholder to avoid using quiche 0.17.1" into tm-mainline-prod am: ec981e76 -s ours am: deff702d -s ours am: c793bc44 -s ours am: 7fc7f6ad -s ours

am skip reason: contains skip directive

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



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