[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: 4540be47 -s ours

am skip reason: contains skip directive

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



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