This reverts commit 31a662d2.

Bug: 235293624
Tag: #refactor
Test: manual & atest CtsBluetoothTestCases
Reason for revert: Breaks

Merged-In: I1a9505fabd581201117ec54f711c4120a092afb7
Merged-In: I60bae5d51b6128489964f7ed32c4f9f2605471a0
Change-Id: I60bae5d51b6128489964f7ed32c4f9f2605471a0
(cherry picked from commit b88a3897)
Merged-In: I60bae5d51b6128489964f7ed32c4f9f2605471a0