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

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



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