Merge "Restoring SDR brightness immediately when entering dim state if the device is in HDR brightness scale mode." am: 13df77c341 am: fa55b26fae

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

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