Merge "Minimal fix for SDP crash" am: 59a7ebe7 am: bb2da434 am: 034ed80e...

Merge "Minimal fix for SDP crash" am: 59a7ebe7 am: bb2da434 am: 034ed80e am: e6f305f6 am: de31881e

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



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