Merge "Support query cancellation for async DNS API"
am: 6aea92f594

Change-Id: I400d98e13cf36ca16c3743eddee96bfae4b47b5c
tree: cac1927117c100e6a34a22fdbbd8c2f8cadaf6d8
  1. core/
  2. services/
  3. tests/