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

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



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