Merge "Move shortcut falsing shake and vibration to onclicklistener" into...

Merge "Move shortcut falsing shake and vibration to onclicklistener" into udc-qpr-dev am: 7adeffd9

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



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