Merge "Remove support for DNS-over-TLS certificate fingerprints." am: 02eda0692e
am: 843cb17ce3

Change-Id: I792abfa8d2ed7794651b99e78dee2b8dcd4e1296