[automerger skipped] Merge "csip: Force CSIP implementation to behave...

[automerger skipped] Merge "csip: Force CSIP implementation to behave incorrectly" into tm-d1-dev am: b823bff1 -s ours am: 26d77cf5 -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: I14cf91f7ba24ec740bb7f9c6167600834a078f4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>