Merge "android.hardware.media.c2: sync with internal" am: 9efd5025fc

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

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