Merge "SDP: disconnect on wrong element" into tm-dev am: 9cceca18 am: 0d62b840 am: a84fd9d6

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



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