Merge "Fix an OOB bug in remove_sdp_record" into tm-dev am: 65930cfb am:...

Merge "Fix an OOB bug in remove_sdp_record" into tm-dev am: 65930cfb am: ae197828 am: 2adf5018

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



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