Merge "Remove remains of dead code around service discovery" into main am:...

Merge "Remove remains of dead code around service discovery" into main am: 7a70f98f am: 91ba5c87

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



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