Merge "Merge "Make TextureView's HDR definitions the same as ColorSpace's"...

Merge "Merge "Make TextureView's HDR definitions the same as ColorSpace's" into udc-dev am: 024968cb am: 904530e9 am: 12c2ddf5" into udc-qpr-dev-plus-aosp am: 4930902a

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



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