Merge changes from topic "bluetooth_server_configurable_flag" into main am:...

Merge changes from topic "bluetooth_server_configurable_flag" into main am: 3f7e8c1a am: 04fd301c

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



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