am bbd460d7: (-s ours) am 6aea1154: DO NOT MERGE: KeyguardManager: Add...
am bbd460d7: (-s ours) am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
* commit 'bbd460d7':
DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()