Merge "keystore: Check for unlock, not for specific state"
tree: d0bf91f87fb78af06bda94d8da95f982517c20da
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/