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

Change-Id: I034361541f64c10d72474beaefdb3547c9c2733e