Merge "Test: Make doh_unit_test boot_time::timeout_drift less flaky" am: 37d7b4cc am: 76c1a69c am: 724e1334 am: 467c94e3 am: 10043197 am: 4ef6290a

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



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