Merge "Refactor permission and state checking"
tree: cfb7a4a0e1d6f7ea2fdbe0bf8607dc37747662ec
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/