[automerger skipped] General clean up and fix flaky ABBA ABAB unit test am:...

[automerger skipped] General clean up and fix flaky ABBA ABAB unit test am: 01f40e9e am: afb3d327 -s ours

am skip reason: Merged-In Ia94191a873781df3d53987ae15e7e84572726c4e with SHA-1 01f40e9e is already in history

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



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