[automerger skipped] Merge "Turn vibrator off explicitly on waveforms when...

[automerger skipped] Merge "Turn vibrator off explicitly on waveforms when amplitude is zero" am: 240fe528 am: 831f02d2 am: d89f7f23 -s ours

am skip reason: Change-Id I753e4846fce3066b78e818afa5c794b113244ab0 with SHA-1 5f6bbb57 is in history

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

Change-Id: If20effaa04815e12904f95c912d70e158260f08b