Merge "Reduce DnsResolverTest flaky rate" am: f1562ba31c

Change-Id: I30389e9ab8e663dff9d5eb336b482b4eb323f559