Merge "[conflict resolved] Merge "Add type validation in bta_hf_client_sdp.cc"...

Merge "[conflict resolved] Merge "Add type validation in bta_hf_client_sdp.cc" into tm-dev am: 963f729d am: 0e8867c9 am: 235d2c67" into udc-dev-plus-aosp am: 80244c1f

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



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