[automerger skipped] Merge "CCodecBufferChannel: stash flushed input buffers...

[automerger skipped] Merge "CCodecBufferChannel: stash flushed input buffers from PipelineWatcher" into sc-v2-dev am: ab37c680 -s ours

am skip reason: Merged-In I06128438d0de52e139e939afe7e59b166f404c1a with SHA-1 92df7e4f is already in history

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

Change-Id: Ia3b288f600c7a5016b5d77f1071a73bfed1071ca