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: ac6c7b56 am: 21c71b87

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



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