Merge "BassClient: wait for statemachine thread to finish" into main am: 45b076f9

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



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