Backport "Reorganize the code for ..." to AOSP

Original: ag/24706639

Bug: 294854926
Test: m com.android.btservices
Flag: EXEMPT, no-op
Merged-In: I976a5a6d7bb819fd6accdc71eb1501b9606f3ae4
Change-Id: I976a5a6d7bb819fd6accdc71eb1501b9606f3ae4