[automerger skipped] Merge "DnsResolver cts changes to match API council requests" into qt-dev am: 501d2d909d -s ours
am:68beb4fb51-s ours am skip reason: change_id I42df921cc3bb01ea25a671d5a1af678a6d3f5872 with SHA18999684430is in history Change-Id: I7e365c4fc04f1ed0b4fa7e2f002a4346988208f3
This commit is contained in: