Merge "Update ColorSpace _HLG & _PQ to use 203 nit whitepoints" into udc-dev am: 7a1750cd am: 10adef32

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



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