Merge "Fix HDR dimming issues when split screen switching." into main am: 85fb8b6833 am: 77aba9fb4e

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

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