Merge "Fix VibratorService waveform accumulated delay" am: 02fe6c4bf8

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

Change-Id: I96dcac8bc6d085ac830228fa0c64bb515201478f