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

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

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