Merge "Revert^4 "Codec2Client: add support to ApexCodec"" into main am: c90093cd13

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

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