[automerger skipped] Merge "[conflict resolved] Merge "Add type validation in bta_hf_client_sdp.cc" into tm-dev am: 963f729d am: 0e8867c9 am: 235d2c67 am: 39d0887e" into udc-d1-dev-plus-aosp am: f50a0407 -s ours

am skip reason: Merged-In Ib6bfb84a24bfea184350c5ddda7558cd2a29e4ad with SHA-1 998b1fb4 is already in history

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



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