[automerger skipped] Merge "Move shortcut falsing shake and vibration to...

[automerger skipped] Merge "Move shortcut falsing shake and vibration to onclicklistener" into udc-qpr-dev am: 7adeffd9 am: ebd0bbe4 -s ours

am skip reason: Merged-In I2e09718bb2d70983275d0b3e214b344c13f9843b with SHA-1 6c054354 is already in history

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



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