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

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



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