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

Change-Id: I8c555bc94ec774ebaed4836db7fefece88556d16