Merge "Revert "Fix flaky test for DnsResolverTest"" am: 430bcaa1f4

Change-Id: Ibbc118c40d9f75a4225fc8bd06d21f73c56f1adb
tree: 5bee1c52e3df5420137e17ffcf6490018048f527
  1. tests/