am 563ee4d6: Merge "Cleanup password change and removal logic."

* commit '563ee4d6102830a66ce6765ed53ad14f21d49089':
  Cleanup password change and removal logic.
tree: 8557c54d69bf2b2a6076b9be6d29bc3814bb5c18
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/