Merge "CCodec: remove queue timeout" am: 924caca6 am: 489edf38

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



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