[automerger skipped] Merge "RE-RELAND "codec2 hal: Codec2ConfigurableClient to...

[automerger skipped] Merge "RE-RELAND "codec2 hal: Codec2ConfigurableClient to take HIDL or AIDL base"" into udc-dev-plus-aosp am: 795cb423 -s ours am: 664d2171 -s ours am: 3658a79e -s ours

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

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



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