am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev

* commit '97594d6cea4dfcfc6bc41bcf2ef7bd2e461cd13e':
  Unhide KeyguardManager locked and secure state getters