Merge "Fix SDR layer luminance increase" into tm-dev am: ba3e89d4 am: d523d95e am: e903e2a5

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



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