[automerger skipped] RELAND "codec2 hal: Codec2ConfigurableClient to take HIDL or AIDL base" am: c8fc2c3946 am: cf8653b164 -s ours am: f4e6ba74cc -s ours am: ecdad3f61f -s ours

am skip reason: Merged-In I8c83c6b74a5042406f203b80b564e2768def1a9a with SHA-1 b80887e51f is already in history

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

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