diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java b/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
index 62e28fe6988..9c7f00701d5 100644
--- a/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
@@ -33,7 +33,7 @@ import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
 import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
-import com.android.settingslib.datastore.ChangeReason;
+import com.android.settingslib.datastore.DataChangeReason;
 import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 import java.lang.annotation.Retention;
@@ -225,7 +225,7 @@ public class BatteryOptimizeUtils {
 
         // App preferences are already clear when code reach here, and there may be no
         // setAppUsageStateInternal call to notifyChange. So always trigger notifyChange here.
-        BatterySettingsStorage.get(context).notifyChange(ChangeReason.DELETE);
+        BatterySettingsStorage.get(context).notifyChange(DataChangeReason.DELETE);
 
         allowlistBackend.refreshList();
         // Resets optimization mode for each application.
@@ -371,7 +371,7 @@ public class BatteryOptimizeUtils {
                         getAppOptimizationMode(appStandbyMode, allowListed));
     }
 
-    private static @ChangeReason int toChangeReason(Action action) {
-        return action == Action.RESTORE ? ChangeReason.RESTORE : ChangeReason.UPDATE;
+    private static @DataChangeReason int toChangeReason(Action action) {
+        return action == Action.RESTORE ? DataChangeReason.RESTORE : DataChangeReason.UPDATE;
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
index 9686709c013..6094208cfaf 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
@@ -49,7 +49,7 @@ import android.os.UserManager;
 import android.util.ArraySet;
 
 import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
-import com.android.settingslib.datastore.ChangeReason;
+import com.android.settingslib.datastore.DataChangeReason;
 import com.android.settingslib.datastore.Observer;
 import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
@@ -164,7 +164,7 @@ public class BatteryOptimizeUtilsTest {
         TimeUnit.SECONDS.sleep(1);
 
         verifySetAppOptimizationMode(AppOpsManager.MODE_IGNORED, /* allowListed */ false);
-        verify(mObserver).onChanged(ChangeReason.UPDATE);
+        verify(mObserver).onChanged(DataChangeReason.UPDATE);
     }
 
     @Test
@@ -178,7 +178,7 @@ public class BatteryOptimizeUtilsTest {
         TimeUnit.SECONDS.sleep(1);
 
         verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ true);
-        verify(mObserver).onChanged(ChangeReason.UPDATE);
+        verify(mObserver).onChanged(DataChangeReason.UPDATE);
     }
 
     @Test
@@ -192,7 +192,7 @@ public class BatteryOptimizeUtilsTest {
         TimeUnit.SECONDS.sleep(1);
 
         verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
-        verify(mObserver).onChanged(ChangeReason.UPDATE);
+        verify(mObserver).onChanged(DataChangeReason.UPDATE);
     }
 
     @Test
@@ -300,7 +300,7 @@ public class BatteryOptimizeUtilsTest {
         inOrder.verify(mMockBackend).isAllowlisted(PACKAGE_NAME, UID);
         inOrder.verify(mMockBackend).isSysAllowlisted(PACKAGE_NAME);
         verifyNoMoreInteractions(mMockBackend);
-        verify(mObserver).onChanged(ChangeReason.DELETE);
+        verify(mObserver).onChanged(DataChangeReason.DELETE);
     }
 
     @Test
@@ -311,7 +311,7 @@ public class BatteryOptimizeUtilsTest {
                 /* isSystemOrDefaultApp */ false);
 
         verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
-        verify(mObserver).onChanged(ChangeReason.DELETE);
+        verify(mObserver).onChanged(DataChangeReason.DELETE);
     }
 
     @Test
@@ -322,7 +322,7 @@ public class BatteryOptimizeUtilsTest {
                 /* isSystemOrDefaultApp */ false);
 
         verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
-        verify(mObserver).onChanged(ChangeReason.DELETE);
+        verify(mObserver).onChanged(DataChangeReason.DELETE);
     }
 
     private void runTestForResetWithMode(