Merge "Don't show 'unlock at boot' for file encryption"

src/com/android/settings/ChooseLockGeneric.java

@@ -240,6 +240,7 @@ public class ChooseLockGeneric extends SettingsActivity {
             if (UserManager.get(getActivity()).isAdminUser()
                     && mUserId == UserHandle.myUserId()
                     && LockPatternUtils.isDeviceEncryptionEnabled()
+                    && !LockPatternUtils.isFileEncryptionEnabled()
                     && !dpm.getDoNotAskCredentialsOnBoot()) {
                 mEncryptionRequestQuality = quality;
                 mEncryptionRequestDisabled = disabled;