Merge "Test: Make doh_unit_test boot_time::timeout_drift less flaky" am: 37d7b4cc am: 76c1a69c am: 724e1334 am: 467c94e3 am: 5d4a4c30 am: 837caea1

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



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