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: I8cdd9c696add4a89653f81bacc94342f10aa7a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>