Merge "Change the long-press behavior on custom shortcuts to utilize an actual...

Merge "Change the long-press behavior on custom shortcuts to utilize an actual long-press" into udc-dev am: d6cc0131 am: d6010292 am: 0fbcce17 am: a6749040

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



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