Merge "Making 2 flags read only since they are used on backup and restore" into main

src/com/android/launcher3/model/GridSizeMigrationUtil.java

@@ -124,7 +124,7 @@ public class GridSizeMigrationUtil {
             return true;
         }
 
-        if (Flags.gridMigrationFix()
+        if (Flags.enableGridMigrationFix()
                 && srcDeviceState.getColumns().equals(destDeviceState.getColumns())
                 && srcDeviceState.getRows() < destDeviceState.getRows()) {
             // Only use this strategy when comparing the previous grid to the new grid and the

src/com/android/launcher3/provider/RestoreDbTask.java

@@ -123,7 +123,7 @@ public class RestoreDbTask {
         // executed again.
         LauncherPrefs.get(context).removeSync(RESTORE_DEVICE);
 
-        if (Flags.narrowGridRestore()) {
+        if (Flags.enableNarrowGridRestore()) {
             String oldPhoneFileName = idp.dbFile;
             removeOldDBs(context, oldPhoneFileName);
             trySettingPreviousGidAsCurrent(context, idp, oldPhoneFileName);