Merge "Fix service discovery on dual mode device, when pairing on LE...

Merge "Fix service discovery on dual mode device, when pairing on LE transport" into main am: 159f23fe am: cb186627

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



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