Merge "Use SDP when SDP succeeds and EIR when SDP fails" into tm-dev am: ffc7b2bb am: 232d4ed2

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



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