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

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



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