Merge "Fix CodecLooper queue block issue" into main am: 1f4ed7f4 am: cd7c3e26 am: a8417a4f

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



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