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

Change-Id: Id0a6e1311eb8f02d2521fc66e48ac306ed8bd03d