Merge "C2SoftVpxEnc: add support for more colorAspects in RGB to YUV conversion" am: d24ecd25c6 am: 3da425bae0 am: 7227a50d05 am: 444605e2e2

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

Change-Id: I3056a1e537e82af90cf182c04cef0fff17d427c8