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

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



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