Merge "Fix shader calculation equations that causes SDR grayscale mess-up." into tm-dev am: df2e6cb29f

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

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