Merge "Update the encryption password when the device password is changed." into honeycomb