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

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



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