[automerger skipped] has_client: Always write CCC values am: 0f39397d -s...

[automerger skipped] has_client: Always write CCC values am: 0f39397d -s ours am: 2a75eb8a -s ours

am skip reason: Merged-In Ifb354d772fcdf6963f24e962e8b2864902bfb8f2 with SHA-1 6aa1e219 is already in history

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



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