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