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

[automerger skipped] Merge "Disable HDR dimming when screen rotates." into tm-dev am: acdf1d12 am: 0d0eb003 -s ours

am skip reason: Merged-In Ib5c02635928cb9779e6f7968d2ec0ac9e659420b with SHA-1 cf891345 is already in history

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



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