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

Merge "SDP: disconnect on wrong element" into tm-dev am: 9cceca18 am: fa94b5c8 am: 366b1839 am: 183d2065

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



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