[automerger skipped] Merge "Dedupe vibrator state in SystemVibrator callbacks"...

[automerger skipped] Merge "Dedupe vibrator state in SystemVibrator callbacks" into tm-qpr-dev am: 4f0fcbf1 am: b7492979 -s ours

am skip reason: Merged-In Ied46ad70186a2df1c7aa24ccf04e5e8e05824876 with SHA-1 e6aa36d0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20300221



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