Merge "Merge "Add support to slowly bring the vibrator down in VibrationThread" into sc-dev am: a9d5203a am: 79aba1cc" into sc-v2-dev-plus-aosp am: c087d6ff

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

Change-Id: I8603fbeabfb72c0e9b0f8b688acd1152313490af