Merge "Fix VtsHalVibratorManagerTargetTest test fail" into tm-qpr-dev am: d39f11cbb0 am: 62bee20d8e am: 95468b09ba

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

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