[automerger skipped] Merge "media.c2 aidl: Add decoder output allocator...

[automerger skipped] Merge "media.c2 aidl: Add decoder output allocator interface" am: 3c4de3af am: a2147b12 am: 1c0c72e7 am: 16a5725b am: a805823e am: 24834fb2 -s ours

am skip reason: Merged-In Ia0a63c29bb1fceabf290647003865c2a788980ef with SHA-1 bc785c63 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2613750



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