am 90c47791: Merge "Delete user\'s keys only after keystore reset" into lmp-dev

* commit '90c4779146c9ac154fe85cd6a0775f8e1fc29be8':
  Delete user's keys only after keystore reset
tree: f0da7417d811f84e0a2414b80c79661e660a22f4
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/