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 am: d8310f0f

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



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