Merge "Replace dns_tls with private_dns_mode setting"
am: ca92fb5e2b

Change-Id: I58c44a04ef75d025f63e9470ed9624a437a7956c