Merge "Revert "Add media.c2 AIDL service to media.swcodec"" into main am: 0f8f3e4749 am: bfc22ddaee am: 2653370b49

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

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