[automerger skipped] Merge "Minimal fix for SDP crash" into tm-d1-dev am:...

[automerger skipped] Merge "Minimal fix for SDP crash" into tm-d1-dev am: 452356d7 -s ours am: 7edfc163 -s ours am: 145698d1 -s ours

am skip reason: Merged-In I416fd112c270cc5725aec378cc9698a10911f02e with SHA-1 3c19edd1 is already in history

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



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