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

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

Change-Id: I41a33377b7eeddaf7160a7b11cb80e48206b1c25