[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 am: 39d0887e am: 135c933e" into udc-qpr-dev-plus-aosp am: f8250272 -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/+/24992478



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