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

Change-Id: I9d840678b1612c89b7917e8eece0c920326a83a0