Merge "keystore: allow system to clear keys even while encrypted"
tree: df84e20bccc755f569c63b3481bc9213f4dd4fd0
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/