Merge "Introduce FileEncryptionPreferenceController"

diff --cc src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 2d9c5f3,94e75ce..a9acd31
--- 1/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
--- 2/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@@ -252,9 -244,9 +252,9 @@@ public class DevelopmentSettingsDashboa
          controllers.add(new BluetoothSnoopLogPreferenceController(context));
          controllers.add(new OemUnlockPreferenceController(context, activity, fragment));
          // running services
-         // convert to file encryption
+         controllers.add(new FileEncryptionPreferenceController(context));
          controllers.add(new PictureColorModePreferenceController(context, lifecycle));
 -        // webview implementation
 +        controllers.add(new WebViewAppPreferenceControllerV2(context));
          controllers.add(new CoolColorTemperaturePreferenceController(context));
          controllers.add(new DisableAutomaticUpdatesPreferenceController(context));
          // system ui demo mode