Merge "Deprecate SSLCertificateSocketFactory" am: f86156158c
am: 6804819923

Change-Id: Ib92af4ccfb66dc2bf261eb474d54e913bbcd96d8