Merge "Save display persistent data store" into sc-dev am: 6a2953601b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14353385

Change-Id: Id45b8ebbb0c2848da712b1c18c2035537e3a8ef7

services/core/java/com/android/server/display/DisplayManagerService.java

@@ -1282,6 +1282,7 @@ public final class DisplayManagerService extends SystemService {
         // this point.
         sendDisplayEventLocked(displayId, DisplayManagerGlobal.EVENT_DISPLAY_CHANGED);
         scheduleTraversalLocked(false);
+        mPersistentDataStore.saveIfNeeded();
     }
 
     private void handleLogicalDisplayFrameRateOverridesChangedLocked(
@@ -2884,6 +2885,7 @@ public final class DisplayManagerService extends SystemService {
                     if (dpc != null) {
                         dpc.putScreenBrightnessSetting(brightness);
                     }
+                    mPersistentDataStore.saveIfNeeded();
                 }
             } finally {
                 Binder.restoreCallingIdentity(token);