Merge "Two phases to set the password for disk encryption am: a363036b44 am: ad4dcc2ff6" into nyc-mr1-dev-plus-aosp