am a1581c4e: am 83ee2e7a: am f1b8f6bf: Merge "Refactor permission and state checking"

* commit 'a1581c4e1778b31d4fd8cfe9a1219b93d5276df2':
  Refactor permission and state checking
tree: dd22900a2843f09d5c376e7bac23f9ff39e51cae
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/