Merge "Improve cancellation test for async DNS API"
am: 7ac8a1e73e

Change-Id: I65b100abd79e52b20ea81d8e0049b910a761e78b