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

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

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