Merge "Don't return GATT services discovered over SDP separately" am:...

Merge "Don't return GATT services discovered over SDP separately" am: 40e25c71 am: 041bfdf7 am: 6997805e

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



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