Merge "URLConnectionTest: Convert to JUnit 4."
am: ba7d66f62b

Change-Id: I3d1b8da772fade8c3d756758124bdadffa4bfa0f