[automerger skipped] csip: Force CSIP implementation to behave incorrectly am:...

[automerger skipped] csip: Force CSIP implementation to behave incorrectly am: bf238d41 -s ours am: 65487842 -s ours

am skip reason: Merged-In I99627263a92cef0d78630c01c074eae7552a511c with SHA-1 78b38488 is already in history

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



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