[automerger skipped] Merge "Fix an OOB write in SDP_AddAttribute" into tm-dev am: 45e8d2dc am: 4df5175b -s ours

am skip reason: Merged-In I937d22a2df26fca1d7f06b10182c4e713ddfed1b with SHA-1 0846b5b7 is already in history

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



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