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

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

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