[automerger skipped] Merge "csip: avoid create two group with same id" into tm-d1-dev am: 8589b648 am: c437b744 -s ours am: 0bc20168 -s ours

am skip reason: Merged-In Iaff4a54a0ea44d67f256052e7be9ffa47f11407d with SHA-1 30393d0c is already in history

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



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