Merge "Do not use mockito to create HttpURLConnection" am: 83c77c088b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784391

Change-Id: Ic167c952e137d56edfe8266f65db1a224ba65ff6