Merge "floss: not do service discovery with HIDSDPDisable" into main am:...

Merge "floss: not do service discovery with HIDSDPDisable" into main am: 0e48d5a6 am: 11d62e7e am: 0c4956e8

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



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