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

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



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