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

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



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