Merge "[conflict resolved] Merge "Add validation on sdp attr type and size in...
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