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

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

Change-Id: I4f989b79620175486b9188965f46740619078957