am b3db8dc9: am 97594d6c: Merge "Unhide KeyguardManager locked and secure...
am b3db8dc9: am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev
* commit 'b3db8dc9':
Unhide KeyguardManager locked and secure state getters