Merge "Restoring SDR brightness immediately when entering dim state if the...

Merge "Restoring SDR brightness immediately when entering dim state if the device is in HDR brightness scale mode." into udc-dev am: 2fecd503 am: b7081f6f

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



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