[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 am: c042dfe2 -s ours am: 7fdb6d3f -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: I3a41dc644d8b289e723ff96cbc0ddd0cfc6bb6b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>