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

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



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