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

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

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