[automerger skipped] Merge "[conflict resolved] Merge "Add type validation in...

[automerger skipped] 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 am: a8196a5c -s ours am: 4a3e6a9b -s ours

am skip reason: Merged-In I70a15be0409d9368e1d5984b1719f9a917c8cb7e with SHA-1 a2ccb20f is already in history

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



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