[automerger skipped] leaudio: Use common CCID keeper in unicast and broadcast am: 352ee339 -s ours am: 04e6d41b -s ours

am skip reason: Merged-In I109d599ddac080fa2919ef586aa4510e4ab6fe8a with SHA-1 1c852e06 is already in history

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



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