[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: e9191796 -s ours

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

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



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