Merge "Add missing check in getKeyguardDisabledFeature"