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

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

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