am adcea0bf: Merge "Prefer PKIX algorithm name for TrustManagerFactory and KeyManagerFactory"

* commit 'adcea0bf53b5b932013d8290619f17715b33f139':
  Prefer PKIX algorithm name for TrustManagerFactory and KeyManagerFactory