Merge "Custom Lockscreen shortcuts' long-press should call to FalsingManager"...

Merge "Custom Lockscreen shortcuts' long-press should call to FalsingManager" into tm-qpr-dev am: e58ae094 am: 7c776b43

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



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