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

Change-Id: I400d98e13cf36ca16c3743eddee96bfae4b47b5c