Merge "Fix an OOB write in SDP_AddAttribute" into tm-dev am: 45e8d2dc am:...

Merge "Fix an OOB write in SDP_AddAttribute" into tm-dev am: 45e8d2dc am: 695d4eab am: b7f6dfaf

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



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