Merge "Fix crash in KeyguardManager.isDeviceLocked"