Merge "Better notification to user when DNS-over-TLS is broken"
am: f42f3830ec

Change-Id: I8be963e35ed5e5ba914c6d3504a52ccb789aaf29