Merge "Synchronize group-related variables" am: 31057b09 am: dbb16f1c am:...

Merge "Synchronize group-related variables" am: 31057b09 am: dbb16f1c am: 765feabd am: 09747e21

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



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