[automerger skipped] Merge "Fix heap-buffer overflow in sdp_utils.cc" into...

[automerger skipped] Merge "Fix heap-buffer overflow in sdp_utils.cc" into tm-dev am: 8952bdd8 am: 448a0fa9 am: 5f9339f5 am: 9da1a033 am: f454f7f3 am: 92985535 am: 4cfd03dc -s ours

am skip reason: Merged-In Id06699e51937515b2465f0b3ad72eab9e0a8e532 with SHA-1 04122097 is already in history

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



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