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

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

Change-Id: Ie45ae1dcca3278efdc76cad2b09293c9e9850202