Merge "Revert^3 "Codec2Client: add support to ApexCodec"" into main am: 0fe0350bbc am: 0972049832

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

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