Merge "Revert^2 "Codec2Client: add support to ApexCodec"" into main am: 8c45a7ab09 am: d7b90545b6

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

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