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

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



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