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: I30d9aa3583445b0edf17244e50a5509ee6cec985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>