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

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

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



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