[automerger skipped] Merge "DnsResolver cts changes to match API council requests" into qt-dev

am: 501d2d909d -s ours
am skip reason: change_id I42df921cc3bb01ea25a671d5a1af678a6d3f5872 with SHA1 8999684430 is in history

Change-Id: Id63d0d8f5d75b22a1d80b1d10b097a0f689aa261
This commit is contained in:
Luke Huang
2019-04-12 08:52:16 -07:00
committed by android-build-merger

Diff Content Not Available