Merge "Fix flaky test for DnsResolverTest" am: 7207fc3400

Change-Id: I60bc8560501761f000098fb959ab5a8edbc23a92
tree: 7b37f92f0d069cff35a324b5e8708a831a6cd42e
  1. tests/