Merge "csip: Force CSIP implementation to behave incorrectly" into tm-d1-dev am: b823bff1

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



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