Merge "Deflaky test for DnsResolverTest" am: 76fdd5976f am: 39edee84c8

Change-Id: I7fb9cab2b8ff2e2b42de94a3e7f9d3a4d0389b2f
tree: ffce2e25c23b3d327e9d0efcf30b007df4ba300e
  1. tests/