[automerger skipped] Merge "State change tests for BassClientStateMachineTest"...

[automerger skipped] Merge "State change tests for BassClientStateMachineTest" into tm-qpr-dev am: 1fbcd1d2 -s ours am: 3d19d8d2 -s ours

am skip reason: Merged-In I2a12720385b95092673dc950c88661013ed91dfc with SHA-1 02c711c6 is already in history

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



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