Ensure services are searched over BR/EDR transport after BR/EDR pairing am:...

Ensure services are searched over BR/EDR transport after BR/EDR pairing am: 27b10bb8 am: 88aa22f5

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



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