Merge "stagefright: define DCI and Display P3 primaries" into udc-dev am:...

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

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



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