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

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

Change-Id: I56647271124c102360b75daafe9558a5da3027ee