Merge "Fix harmony URLConnectionTest hanging for 25sec." into pie-cts-dev