Merge "Revert "Add media.c2 AIDL service to media.swcodec"" into main am: 0f8f3e47 am: d43c164d

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



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