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

Merge "Fix UAF in sdp_discovery.cc" into tm-dev am: 1cfb2f42 am: ee9730fd am: 6b5d98ad am: 4cbeab24 am: 9ef053bd am: 68a342d4

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



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