Merge "Test HttpsURLConnection.setDefaultSSLSocketFactory(null)." am: c563376b20 am: 22cc337e39
am: d42de99beb

Change-Id: Iafd045744cd5cf151a86bce773c7e0da3269ad83