Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev