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: b0046c1b am: 7ddcf67c

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



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