Bug: 129261432 Test: atest DnsResolverTest Merged-In: I42df921cc3bb01ea25a671d5a1af678a6d3f5872 (cherry picked from commit 8999684430) Change-Id: Ibcb92ac23cf413322234bba9100293ab794cf50e
8999684430