[automerger skipped] Merge "C2AIDL: add codec2 aidl library without...

[automerger skipped] Merge "C2AIDL: add codec2 aidl library without inputsurface dependency" into main am: 6badd5d1 am: b305aa38 -s ours

am skip reason: Merged-In I3f2ffad0cd524b9eac49c4b1081e8d61f3e1a697 with SHA-1 9cdd3df9 is already in history

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



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