[automerger skipped] Merge "CCodec: don't trigger output format change after...

[automerger skipped] Merge "CCodec: don't trigger output format change after flush" into rvc-qpr-dev am: a8a3e652 am: 036da401 -s ours

am skip reason: Change-Id If34bd5eba1498f081d613d2ebc15ff75f2a90f2f with SHA-1 f6c41426 is in history

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

Change-Id: I7698839c6398cc61e6041ae4420117b96c814e0f