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 am: 5e489385

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



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