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

Change-Id: I0c8b5b5fe68b99cacc4da10ae27b69fcab8685b7
tree: 0f46d77829525857bc2dc630b6e8d185e1cdeefd
  1. core/
  2. services/
  3. tests/