Merge "DnsResolver cts changes to match API council requests"
am: ea5e4a5409

Change-Id: I42df921cc3bb01ea25a671d5a1af678a6d3f5872