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

* commit '6a87b09b32adc739b524002354b21bf235ff2153':
  Revert "Two phases to set the password for disk encryption"

Change-Id: Ic7eec73c5fba36a17e3303f2cf06aee1a7435913