[automerger skipped] Merge "CCodec: remove queue timeout" am: 924caca6 am:...

[automerger skipped] Merge "CCodec: remove queue timeout" am: 924caca6 am: 489edf38 am: 7901e94c -s ours am: 42939384 -s ours

am skip reason: Merged-In Ib2b5d44cbf181bc152b5f6b528b42a1404df8aeb with SHA-1 4e323dd9 is already in history

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



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