[automerger skipped] Fix doh flaky test am: 0b2285ae -s ours am: 08457db5...

[automerger skipped] Fix doh flaky test am: 0b2285ae -s ours am: 08457db5 -s ours am: 33bb060f -s ours

am skip reason: Merged-In I1163a8b3fefefa5d83464e6aadd99f667ab141af with SHA-1 6ac664e7 is already in history

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

Change-Id: I300e7ddb1a3f7bc18a688de0eae5f8103b78fe72