Merge "CCodec: lock input surface for concurrent access" into main am: 291b65ac am: d0072461

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



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