Merge "Fix CodecLooper queue block issue" into main am: 1f4ed7f4b2 am: 6b8f0cd35b

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

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