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

* commit '9ecf3d5904fc7426c71565361e3a1652719a6620':

Change-Id: Ic349ec00115052fa01f00662e77257a545bcf97a