Merge "CCodecBufferChannel: fix output delay/reorder config" am: f14789d73f

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

Change-Id: If9a2533b4c72512cbaea776762c5b50af0a1f709