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

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



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