[automerger skipped] Merge "LeAudioService: Provide Ccid to the native code"...

[automerger skipped] Merge "LeAudioService: Provide Ccid to the native code" am: 0fadcc46 am: a5246dde -s ours am: e5de5d98 -s ours am: 93b27fce -s ours

am skip reason: Merged-In I55d8674c86575ba8a91d9c2a1885d02e1009b919 with SHA-1 005ebae4 is already in history

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



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