Merge "Support query cancellation for async DNS API" am: aed6ea52de
am: c19f41b2b2

Change-Id: I890bbb94bf1b8e2242efeb5c868e289a8ae4a95d