Merge "Better notification to user when DNS-over-TLS is broken" am: 81852c8481
am: eb24608dbc

Change-Id: I2d257ced3460985be3980d122496232de73d18b3