Merge "Revert "Codec2Client: add support to ApexCodec"" into main am: b64d76306f am: 2da58decd3

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

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