Merge "Revert "Two phases to set the password for disk encryption" am: d402389290 am: 26642bf7bf" into nyc-mr1-dev-plus-aosp