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

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



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