[automerger skipped] Merge "Add missing check in getKeyguardDisabledFeature" into sc-v2-dev am: 2103430b56 am: ac2550317c -s ours
am skip reason: Merged-In I107d8705e3a65707ae5744e7705a4d32629c3c14 with SHA-1 826f893513 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15950623
Change-Id: I384f1f67f3af21a612e076305a09b7c5786c0cbc
This commit is contained in: