Merge "Lockscreen Shortcuts sometimes do not activate when long-pressing" into...

Merge "Lockscreen Shortcuts sometimes do not activate when long-pressing" into udc-dev am: 6d5c413a am: e55106c6

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



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