Merge "Delete user's keys only after keystore reset" into lmp-dev
tree: 8009432b18232a9a4ff20e050a8ad213076489e0
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/