Merge "Fix and re-enable tests" into main am: 876b84fd am: dd8336e2

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



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