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 am: c5fc30c6

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



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