Merge "Fix the issue of null previous brightness reason in the logs" into udc-dev am: 9cbb43e794

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

Change-Id: I4ce6cb71c12bad63e729ad81472bb3ba2a496ac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -1148,6 +1148,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
         final int previousPolicy;
         boolean mustInitialize = false;
         int brightnessAdjustmentFlags = 0;
+        mBrightnessReasonTemp.set(null);
         mTempBrightnessEvent.reset();
         SparseArray<DisplayPowerControllerInterface> displayBrightnessFollowers;
         synchronized (mLock) {

services/core/java/com/android/server/display/brightness/BrightnessEvent.java

@@ -100,7 +100,7 @@ public final class BrightnessEvent {
      * A utility to reset the BrightnessEvent to default values
      */
     public void reset() {
-        mReason.set(null);
+        mReason = new BrightnessReason();
         mTime = SystemClock.uptimeMillis();
         mPhysicalDisplayId = "";
         // Lux values