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

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



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