[automerger skipped] Merge "Disable lockscreen shortcuts when the user enters...

[automerger skipped] Merge "Disable lockscreen shortcuts when the user enters lockdown mode" into udc-dev am: 38398830 am: 8dec03bd -s ours

am skip reason: Merged-In I7755cf17893e3f98aa66640d68c43bba8bbe7459 with SHA-1 21fb77bf is already in history

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



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