Merge "OpenSSLSocketImpl should tolerate X509KeyManager returning null values"