Merge "Fix shader calculation equations that causes SDR grayscale mess-up."...

Merge "Fix shader calculation equations that causes SDR grayscale mess-up." into tm-dev am: df2e6cb2 am: 8f92fe05 am: 341241aa am: 9988f695

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



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