Merge "Remove separate_service_and_device_discovery" into main am: d63028c4

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



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