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

Change-Id: I3f83c061342202ae4ae19e42738f66d11c5cbfac