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

Change-Id: I37791ec3ed21ceb967df716420dc2507bcf216bc