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

Merge "floss: not do service discovery with HIDSDPDisable" into main am: 0e48d5a6 am: 221861b3 am: ebb86b29

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



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