Merge "Better notification to user when DNS-over-TLS is broken" am: 7317869f48
am: 52b44b20c4

Change-Id: I2d257ced3460985be3980d122496232de73d18b3