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

Change-Id: I1b5bd0d9f007c874d55efe8e6098b953f9e2cd14