[automerger skipped] Merge "Reapply "Add media.c2 AIDL service to...

[automerger skipped] Merge "Reapply "Add media.c2 AIDL service to media.swcodec"" into main am: 101683ca am: b2926545 -s ours am: c3db1f8d -s ours

am skip reason: Merged-In I5deb520d4a2d461be0ec70cb0d763ea0cb1e952e with SHA-1 138db0d0 is already in history

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



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