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

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

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