am df1498dc: am bf043b50: Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."

# By Alex Klyubin
# Via Alex Klyubin (1) and others
* commit 'df1498dcbac86018b719cda8bf2e9ff3a6dedec8':
  Add TLS Channel ID support to SSLCertificateSocketFactory.