am 3695691a: am 971bcaa5: Merge "Fix for flakiness in URLConnectionTest.testServerShutdownOutput"

* commit '3695691a093be11d539b85cf5c20cf91f11a3252':
  Fix for flakiness in URLConnectionTest.testServerShutdownOutput