Merge "Increase VTS GetHalService test timeout" into pie-vts-dev
am: 9242a7c7fd

Change-Id: Ic62538cec7df8885fc5ccb502eb78ee064f1eb1c