Merge pull request #19691 from stangri/master-https-dns-proxy