Merge "Fix UAF in sdp_discovery.cc" into tm-dev am: 1cfb2f42 am: f16758d6 am: e6588c79

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



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