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

Merge "[automerger skipped] Merge "Disable lockscreen shortcuts when the user enters lockdown mode" into udc-dev am: 38398830 am: e9b36c0f am: df515007 -s ours" into udc-qpr-dev-plus-aosp am: c63d31b5 -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: Idf03b10c0c5d6c5c4171d6e1776d64088ed8a9f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>