[automerger skipped] Merge "android.hardware.media.c2: sync with internal" am:...

[automerger skipped] Merge "android.hardware.media.c2: sync with internal" am: 9efd5025 am: 75979829 am: 6cef0242 -s ours am: f4b3f590 -s ours

am skip reason: Merged-In Ia85af4e013529e104c84bc48f84a5daa89a5d9bf with SHA-1 e739e842 is already in history

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



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