General clean up and fix flaky ABBA ABAB unit test

Bug: 248637035
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ia94191a873781df3d53987ae15e7e84572726c4e