Merge "RESTRICT AUTOMERGE Add a hidden KEYGUARD_DISABLE_SHORTCUTS_ALL constant to DevicePolicyManager" into tm-qpr-dev am: 103b7b4818
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21408392 Change-Id: I34cde885073126e6799024ab1b6815447661d66b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: