Revert "Two phases to set the password for disk encryption" am: d402389290
am: 2f8b7d354c

* commit '2f8b7d354c59b74cec719531728523bf19f88dce':
  Revert "Two phases to set the password for disk encryption"

Change-Id: I89687b6a813caca0c214787d3e28d4e4106e7fe2