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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b26915474c263ddebc1032416be18e606a92968