media: update on concurrent codec usage am: de8eb593 am: 33d246d4

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



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