Merge "Fix a SecurityException in setKeyguardEnabledState"