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