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

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

Change-Id: Ie3c13996329b12d1d3c17447cdb737f846b93a04