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

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

Change-Id: I44698f573a709cf38e65d5303631c0a4d2d4ecfc