am 1b895639: (-s ours) am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy &...
am 1b895639: (-s ours) am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
* commit '1b895639':
DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()