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

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



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