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: 7dc59348

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



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