[automerger skipped] Merge "[conflict resolved] Merge "Add validation on sdp attr type and size in hidh_api.cc" into tm-dev am: 114f8039 am: ae8a371b am: 3d7de746 am: 3c31723c" into udc-d1-dev-plus-aosp am: c3e0a6b5 -s ours

am skip reason: Merged-In Ia2e8e588ad890b531b94e2fca84279de603dcc05 with SHA-1 a3c6fc61 is already in history

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



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