Merge "Replace dns_tls with private_dns_mode setting" am: 8cf645c04d am: f1799116c2
am: 76d2732ad8

Change-Id: Icba28e4d4e446dd6eac0f2f017957894e33084f2