Merge "Add cancel test cases for async DNS API" am: bb891d5a24
am: 44ef8af71d

Change-Id: I322f618b0cca9783a9811f38c42c4db6279ca431