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

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

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



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