Merge "CCodec: fix default color aspects handling" am: 020dc0424b am: d9fc71522e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c17f3863cb51ffa234e0c8b62bf65dd0fb14a5b