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: c25ae0e6

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



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