[automerger skipped] Merge "Restoring SDR brightness immediately when entering...

[automerger skipped] Merge "Restoring SDR brightness immediately when entering dim state if the device is in HDR brightness scale mode." am: 13df77c3 am: fa55b26f am: 34b03549 -s ours am: 3f8673da -s ours

am skip reason: Merged-In Ie8ba03cfdd4a8aa446071e05db1c302182a92939 with SHA-1 3beaadb2 is already in history

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



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