Merge "VTS: Replace deprecated 'getService' by 'waitForService'" am: 2c0a687519 am: b90b6e7b1f

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2425754

Change-Id: I1fd514de8e432548d041ef4abe1c7d534cfd685d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>