Merge "Deflaky test for DnsResolverTest" into rvc-dev am: 3f9e3e848b

Change-Id: I6450335b29cc5385a3d0a37e6bce16de5776f666