Merge "KeyguardManager: Fix user resolution of isDeviceSecure/Locked"