Merge "Cleanup password change and removal logic."
tree: b5335b777f530281e5d50241addacd0fd3c13d2a
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/