[automerger skipped] Merge "Revert "Fix flaky test for DnsResolverTest"" into rvc-dev am: 90c57f73d4 -s ours

am skip reason: Change-Id I083529616dbf80421ea6a322bb57d2bb0f2bca62 with SHA-1 dfa5480414 is in history

Change-Id: Ic3590e3e47ec829fd4aeab29a1d292cac155cfdf
tree: a0064e345156a16a2f250c0a2bbb66525e7131c3
  1. tests/