Merge "Treat dimming-disabled layers as HDR" into tm-dev am: 00679b8a am:...

Merge "Treat dimming-disabled layers as HDR" into tm-dev am: 00679b8a am: c893b043 am: 090a0a57

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



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