Merge "Minor changes to the async DNS query API CTS tests." am: 5419511192
am: ef79d5b32d

Change-Id: I71e0c9dfd4d63e1742d07eb3888cf4b8a8590d1e