diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index fe396bd6009..b08f4e3e441 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -639,6 +639,13 @@ public class BatteryUtils {
         return DockDefenderMode.DISABLED;
     }
 
+    /** Formats elapsed time without commas in between.  */
+    public static CharSequence formatElapsedTimeWithoutComma(
+            Context context, double millis, boolean withSeconds, boolean collapseTimeUnit) {
+        return StringUtil.formatElapsedTime(context, millis, withSeconds, collapseTimeUnit)
+                .toString().replaceAll(",", "");
+    }
+
     /** Builds the battery usage time summary. */
     public static String buildBatteryUsageTimeSummary(final Context context, final boolean isSystem,
             final long foregroundUsageTimeInMs, final long backgroundUsageTimeInMs,
@@ -675,7 +682,7 @@ public class BatteryUtils {
         if (timeInMs < DateUtils.MINUTE_IN_MILLIS) {
             return context.getString(lessThanOneMinuteResId);
         }
-        final CharSequence timeSequence = StringUtil.formatElapsedTime(
+        final CharSequence timeSequence = formatElapsedTimeWithoutComma(
                 context, (double) timeInMs, /*withSeconds=*/ false, /*collapseTimeUnit=*/ false);
         return context.getString(normalResId, timeSequence);
     }
diff --git a/src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeController.java b/src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeController.java
index 64642d71eb4..286a95fc1f1 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeController.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeController.java
@@ -28,7 +28,7 @@ import androidx.preference.PreferenceScreen;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.utils.StringUtil;
+import com.android.settings.fuelgauge.BatteryUtils;
 
 import java.util.Locale;
 import java.util.regex.Matcher;
@@ -89,10 +89,10 @@ public class ScreenOnTimeController extends BasePreferenceController {
     @VisibleForTesting
     void showScreenOnTimeText(Long screenOnTime) {
         final CharSequence timeSequence =
-                StringUtil.formatElapsedTime(mPrefContext, (double) screenOnTime,
+                BatteryUtils.formatElapsedTimeWithoutComma(mPrefContext, (double) screenOnTime,
                         /*withSeconds=*/ false, /*collapseTimeUnit=*/ false);
         mScreenOnTimeTextPreference.setText(
-                enlargeFontOfNumberIfNeeded(mPrefContext, removeCommas(timeSequence)));
+                enlargeFontOfNumberIfNeeded(mPrefContext, timeSequence));
         mScreenOnTimeTextPreference.setVisible(true);
     }
 
@@ -115,8 +115,4 @@ public class ScreenOnTimeController extends BasePreferenceController {
         }
         return spannableText;
     }
-
-    private static CharSequence removeCommas(CharSequence text) {
-        return text.toString().replaceAll(",", "");
-    }
 }