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

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

Change-Id: I8b053e855922d763b232b0925605e210f9522e38