am bc22f8d6: am 410ba59a: Fix failure to save master key on new profile

* commit 'bc22f8d63e2ca24ee4ee9d61258d6704bc78724b':
  Fix failure to save master key on new profile
tree: 22025ecd03d16665781865070d11c4d8e838b158
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/