Merge "Unremove DnsResolver#query method used by external developers" am: 3dd6df002b am: 3206b80bae
am: 2e58d5b4e5

Change-Id: Ibfba10cb92e63a7ae727f48543da040aa5f39116