[automerger skipped] media: update on concurrent codec usage am: de8eb593...

[automerger skipped] media: update on concurrent codec usage am: de8eb593 am: 33d246d4 am: 757e6560 -s ours am: b90e7ee1 -s ours

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

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



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