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

Merge "Disable lockscreen shortcuts when the user enters lockdown mode" into udc-dev am: 38398830 am: e9b36c0f

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



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