diff --git a/src/com/android/settings/display/darkmode/TimeFormatter.java b/src/com/android/settings/display/darkmode/TimeFormatter.java
index 87d22dabd27..5b1880642f4 100644
--- a/src/com/android/settings/display/darkmode/TimeFormatter.java
+++ b/src/com/android/settings/display/darkmode/TimeFormatter.java
@@ -25,13 +25,14 @@ import java.time.format.DateTimeFormatter;
 */
 public class TimeFormatter {
     private final Context mContext;
-    public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("hh:mm a");
+    private final DateTimeFormatter mFormatter;
     public TimeFormatter(Context context) {
         mContext = context;
+        mFormatter = DateTimeFormatter.ofPattern("hh:mm a");
     }
 
     public String of(LocalTime time) {
-        return is24HourFormat() ? time.toString() : formatter.format(time);
+        return is24HourFormat() ? time.toString() : mFormatter.format(time);
     }
 
     public boolean is24HourFormat() {