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

[automerger skipped] Merge "Backport "Reorganize the code for ..." to AOSP" into main am: 4b86ebbf -s ours am: 88edd5d3 -s ours am: fa4f60bb -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: I9495d2f786627dfff08c60f1949db4179b0e0d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>