Merge "Fix AIDL sensors VTS test" into tm-dev am: 890208a598 am: 22719c228a

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

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