Merge "Add support for non-leaf DNS-over-TLS pinning"