[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: 7286cd9f -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: If4645ded817e52c13d1a4eade5ac4a9103227012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>