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

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

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



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