Merge "bta_dm_disc: remove remaining unused services mentions" into main am:...

Merge "bta_dm_disc: remove remaining unused services mentions" into main am: 48d30191 am: 6dd30f8a

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



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