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

Merge changes from topic "bluetooth_server_configurable_flag" into main am: 3f7e8c1a am: 525c00f7

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



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