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

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

Change-Id: Ic0e650b191e4f350efeba30043394ecb6b96e0d2