[automerger skipped] Merge "CCodecBufferChannel: fix output delay/reorder config" am: f14789d7 am: 42f0ac61 am: ac2d02c4 -s ours am: f71b1c41 -s ours

am skip reason: Merged-In I449ae82c83001f5c76402df76eaa7672315aa32d with SHA-1 84f439f7 is already in history

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

Change-Id: I93e19f5730d3aeb3dd16f5dec305db0c75fdc2cd