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

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



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