Merge "Fix extended range handling when Gamma OETF is used" into udc-d1-dev am: a34acd1a29 am: f88c330e87

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

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