[automerger skipped] Merge "Deflaky test for DnsResolverTest" into rvc-dev am: 3f9e3e848b -s ours
am skip reason: Change-Id I224a6493c87cebaf0bf954c2644e2945ccd50db1 with SHA-1 d6e36d820e is in history
Change-Id: I31a3d1e92a8c59a4c167b927e4353eed30f6e112
This commit is contained in: