* commit '69e19ae15baa5785667dbf45c7a2d508e429099b': DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
* commit '69e19ae15baa5785667dbf45c7a2d508e429099b': DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()