am 46cdd437: am 0048f466: Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."

* commit '46cdd4376775c3b84139f2e4d734ef8affbd605c':
  Switch TLS Channel ID API from ECPrivateKey to PrivateKey.