Merge "Fix SDR layer luminance increase" into tm-dev am: ba3e89d4 am: 480da697 am: 6255b2c0

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



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