[automerger skipped] Merge "[SurfaceFlinger] Disable HDR dimming when screen...

[automerger skipped] Merge "[SurfaceFlinger] Disable HDR dimming when screen rotates." into tm-dev am: d7590c4a am: 5745f7e7 -s ours

am skip reason: Merged-In Ib07a5af1d4e3e91737b3d5f3e5869c166759563f with SHA-1 81d95e65 is already in history

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



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