Merge "Test that DefaultHttpClient responds gracefully when the server closes a socket. http://b/2612240"