Merge "General clean up and fix flaky ABBA ABAB unit test" am: eb367ceb

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



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