Merge "Add developer options to force enable Notes role." into udc-dev

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

@@ -733,6 +733,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         controllers.add(new PhantomProcessPreferenceController(context));
         controllers.add(new ContrastPreferenceController(
                 context, context.getSystemService(UiModeManager.class)));
+        controllers.add(new ForceEnableNotesRolePreferenceController(context));
 
         return controllers;
     }