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

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

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



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