Merge "Fix system crash in Atms.notifyKeyguardFlagsChanged."