Merge "stagefright: define DCI and Display P3 primaries" into udc-dev am: 3606074f am: 7c5ed307

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



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