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: 5ea588d8 am: d9729a87

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



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