Merge "Move adapter flag outside of system_service" into main am: b5927ac9 am: 6b41c29b

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



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