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

Change-Id: Iffbdc181d8249f26b3c370474583673aaa1c5032