Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."