[automerger skipped] Merge "media: update on concurrent codec usage" into...

[automerger skipped] Merge "media: update on concurrent codec usage" into udc-dev am: ee9f3ae4 am: 7ac66980 -s ours

am skip reason: Merged-In I69536f10e01f66556536812dbbe3af7831a3c722 with SHA-1 ba4bc8e3 is already in history

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



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