Merge "Deprecate SSLCertificateSocketFactory"
am: f86156158c

Change-Id: I30dafbd9577dbaced7712b7497ecb0e0324c75f5