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

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

Change-Id: Ic4c840f2c50044c76c8aafe18b1cf8fddb6a4546