Merge "Add step down ramp to vibration waveforms" into sc-dev am: 50471a76 am: beae8429

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

Change-Id: I056562d80864a8a88d124ac644332826c4b0d14b