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

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

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



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