Merge "Fix DnsResolver API could not bypass private DNS correctly"
am: 40e7fb6a9b

Change-Id: Iaa36a882c2bcfd3bb11153d2b37cdab887ad9004