[automerger skipped] Merge "Test: Make doh_unit_test boot_time::timeout_drift...

[automerger skipped] Merge "Test: Make doh_unit_test boot_time::timeout_drift less flaky" into tm-mainline-prod am: 6b47432b -s ours

am skip reason: Merged-In Ia1c124f58b388357d4b0f96d5c06bce8ab739355 with SHA-1 469e8f41 is already in history

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



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