Merge "Codec2BufferUtils: add support for more color aspects" into sc-dev am: e63db370 am: 108a9e5f

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

Change-Id: I3f5eaaa28de995b701b36116f51a11660106e86c