Merge "Increase VTS GetHalService test timeout" into pie-vts-dev