DO NOT MERGE - Allow FR in carrier demo mode

am: bb6859ca75

Change-Id: Ie0ff34a0b8a429caa5119c8bbc42de7b24f3b9ce

src/com/android/settings/SettingsActivity.java

@@ -1139,7 +1139,8 @@ public class SettingsActivity extends SettingsDrawerActivity
             }
         }
         setTileEnabled(new ComponentName(packageName,
-                BackupSettingsActivity.class.getName()), hasBackupActivity, isAdmin, pm);
+                BackupSettingsActivity.class.getName()), hasBackupActivity,
+                isAdmin || Utils.isCarrierDemoUser(this), pm);
 
     }