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

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

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



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