Merge "bass: Fix broken test cases" into main am: e1e13c2f

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



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