Merge "C2SoftAvcEnc: Add support for color aspects" am: 156236bb90 am: 3c6520c230

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

Change-Id: I0c982294f269e9c8f80b1e32e6bca74636591ea2