Merge "Reduce DnsResolverTest flaky rate" am: de7f28fcf4 am: 3f998cd2dd

Change-Id: I2c15b55cadead21f85cb6929470a82b22fe6962e