Merge "Disable lockscreen shortcuts when the user enters lockdown mode" into...

Merge "Disable lockscreen shortcuts when the user enters lockdown mode" into udc-qpr-dev am: 17b8a48f

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



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