Merge "csip: avoid create two group with same id" into tm-d1-dev am: 8589b648

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



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