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

Change-Id: Ie22994f9c66941eb65053f688f848c9f8d22bd7c
tree: 3b1be76fa7f6458077962c53f0070740c1f55e9e
  1. tests/