Merge "stack::sdp: Declare and assign tCONN_CB together" into main am: 7a5e1b64

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



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