Merge "Prefer connected transport for service discovery on dual mode devices"...

Merge "Prefer connected transport for service discovery on dual mode devices" into main am: 25c7bdf3

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



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