[automerger skipped] Merge "leaudio: Add a way to pass CCID from Java to...

[automerger skipped] Merge "leaudio: Add a way to pass CCID from Java to Native code" am: 05c988ba am: b9795bf0 -s ours

am skip reason: Merged-In I22d19a1af758631435266b91ea455f171ab9335c with SHA-1 89a12d30 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2101219



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