[automerger skipped] Backport "Reorganize the code for ..." to AOSP am:...

[automerger skipped] Backport "Reorganize the code for ..." to AOSP am: 01f9d8e5 -s ours am: e2ad7029 -s ours

am skip reason: Merged-In I976a5a6d7bb819fd6accdc71eb1501b9606f3ae4 with SHA-1 6bacbe90 is already in history

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



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