Merge "Revert "android.hardware.media.c2: Move to staging/"" into udc-dev-plus-aosp am: a38827ed

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



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