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

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