am 64ab8fcd: (-s ours) am dcddea95: Merge "Handle keyguard visibility states separately. DO NOT MERGE" into jb-dev

* commit '64ab8fcd6f2011c0d185f2973b9615f155f6d239':
  Handle keyguard visibility states separately. DO NOT MERGE