[automerger skipped] Merge "Revert "android.hardware.media.c2: Move to...

[automerger skipped] Merge "Revert "android.hardware.media.c2: Move to staging/"" into udc-dev-plus-aosp am: a38827ed am: 2b56fdf6 am: 2e38c7c5 -s ours

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

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



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