Merge "CCodec: Updates to RevertOutputFormatIfNeeded" am: 6169766b54 am: ab8692eb32

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f2d93b2a50c454e2571c86231087ea773b09405