Merge "Respect KEYGUARD_DISABLE_SHORTCUTS_ALL" into tm-qpr-dev am: d112915038 am: a52f82b01d am: de8e8f69c5 am: 11f513ab4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21421869 Change-Id: Ia5036c09c94e50ea08763c09a83a6aedd2af9c6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: