DO NOT MERGE - Require password to FR in carrier demo mode

Bug: 34341567
Test: manual - password is not required for regular user factory
resets and is required in carrier demo mode.

Change-Id: Icadb6edb3d85ae58b45862c182b6b03bf2c3ce16

src/com/android/settings/Utils.java

@@ -1214,6 +1214,7 @@ public final class Utils extends com.android.settingslib.Utils {
         return UserManager.isDeviceInDemoMode(context)
                 && getUserManager(context).isDemoUser()
                 && !TextUtils.isEmpty(carrierDemoModeSetting)
-                && Settings.Secure.getInt(context.getContentResolver(), carrierDemoModeSetting, 0) == 1;
+                && Settings.Secure.getInt(
+                        context.getContentResolver(), carrierDemoModeSetting, 0) == 1;
     }
 }