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: 32d7ad08 am: e383f45f

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



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