Merge "Fix a race condition in CCodecBufferChannel::requestInitialInputBuffers" into main am: 3d1e0c86cc am: f83df4c6ba

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

Change-Id: I4d6c3bf76a27569e65c729f2fb905b6c3eef14ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>