[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: 1cd9690d am: 8b603945 am: e45c1db4 am: 6bed93ef -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: If821f4c49b710efd57699657103fd1f72b01da8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>