Merge "media.c2 aidl: apply aidl definition update" into main am: 1e0b299755 am: 7324fed04d am: 5ca08c8cf8

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2808294

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