Merge "Align the lockscreen shortcuts haptics with the animation" into udc-dev...

Merge "Align the lockscreen shortcuts haptics with the animation" into udc-dev am: d8d6ce33 am: ac430218

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



Change-Id: Ia4b6c78b674526ba0ca74c4bbf6fd1dab85ce561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>