[automerger skipped] RELAND CCodec: simplify format change logic am: 970bf0bef8 am: 76c337710e am: 14a4c130c1 -s ours

am skip reason: Change-Id I0a10bacc11bed974d7393aea1158b06ded286f19 with SHA-1 3b4349ac92 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie14a55f7d778727f4caa1e23d30927bbe26ce174