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

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

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