[conflict resolved] Merge "Add validation on sdp attr type and size in...

[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

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



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