Merge "Fix AIDL sensors VTS test" into tm-dev am: 890208a598 am: 99102c8f76

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

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