Merge "Fix harmony URLConnectionTest hanging for 25sec." into pie-cts-dev am: 781e06ebf9 am: 77c5f9bc10
am: b57c006c9f

Change-Id: I5a682c22ccfd2747215cc28a30910de217f26346