Merge "HttpURLConnection: Add test coverage for concurrent disconnect." am: 47b6180fdb
am: 5cff1a9809

Change-Id: I9951ccb2aedaecbc2e3fd7e5ea019c546e4bd569