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: e0866ce0

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



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