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 am: 4b54e5d9

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



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