[automerger skipped] Merge "Add tests for BassClientStateMachine#GattCallback"...

[automerger skipped] Merge "Add tests for BassClientStateMachine#GattCallback" into tm-qpr-dev am: 8c07f6b5 -s ours am: c7fec512 -s ours

am skip reason: Merged-In I6e8b04f25acb8ed6cb113a93c231e7ae80b111c2 with SHA-1 be0e5bfa is already in history

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



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