Merge "C2SoftHevcEnc: Add support for color aspects" am: acbd3c4333

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

Change-Id: I089fa6f616b719743a0b026fc231b34b55c9b385