Merge "media: update on concurrent codec usage" into udc-dev am: ee9f3ae4ca

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

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