Merge "fix data encryption fail when ENCRYPTION_FLAG_NO_UI is set" am: c222ad20ee
am: a921b6795e

Change-Id: Ia297c274b7a2b0005b31f69354fb4a7773f02439