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

Change-Id: Ia44cb9a5bf4267715fda6f28d615eb1fe05f5d28