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

* commit '971bcaa513fc1c6cb8ac6612d85f69d2bb45314f':
  Fix for flakiness in URLConnectionTest.testServerShutdownOutput