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

Merge "Fix Nullptr access in sdp" into tm-dev am: 8b301a94 am: 972844a5 am: 6be8ffd5 am: ba10152d

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



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