Merge "Fix failure to save master key on new profile"
tree: ceea7f8192c3a4656c99175fdaaec87dad7c0f61
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/