am cf6718b6: Merge "Update tests for HttpURLConnection.disconnect() changes"

* commit 'cf6718b6cfc0377fe66fb98e1fb1b2d6456e1937':
  Update tests for HttpURLConnection.disconnect() changes