Merge "csis: Fix possible crash when group got removed" am: 2cc75e03 am:...

Merge "csis: Fix possible crash when group got removed" am: 2cc75e03 am: 0ea5d98f am: bdc76ea2

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



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