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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9dc4d0ffa1405a3425e46bdd0c9f1ac98699ef23