Merge "Turn vibrator off explicitly on waveforms when amplitude is zero" am: 240fe52811 am: 831f02d294

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

Change-Id: I5c88cd297f4da3741561bdd8e237a35c7994b870