Merge "Fix Nullptr access in sdp" into tm-dev am: 8b301a94 am: 70b64230...

Merge "Fix Nullptr access in sdp" into tm-dev am: 8b301a94 am: 70b64230 am: 1b0362d6 am: 577659d4

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



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