[automerger skipped] Merge "Fix VibratorService waveform accumulated delay"...

[automerger skipped] Merge "Fix VibratorService waveform accumulated delay" am: 02fe6c4b am: 10fec2b5 am: a0a83264 am: 7a247315 -s ours

am skip reason: Change-Id Iafe7f031444f68cd2cdc16883812874f385cba8e with SHA-1 934559ac is in history

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

Change-Id: Iae904540ed24fe0aca5f4e6a68bb2beb5d6172e3