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

Change-Id: I89a3bcfee039985d21d8974611d51ed181c54100