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

Change-Id: I0a6647080a7325e408fe22f1f54d333ef7931691