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

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



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