Merge "media.c2 aidl: apply aidl definition update" into main am: 1e0b299755 am: 07e7662b67 am: 870862c92e

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

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