[automerger skipped] Merge "[conflict resolved] Merge "Add validation on sdp attributes in bta_ag_sdp.cc" into tm-dev am: b4aaf94b am: 5dea751e am: e97b8eb2" into udc-dev-plus-aosp am: a7769323 am: 11745c02 -s ours

am skip reason: Merged-In I0b3daa4f14123f06fdbbdcca8e79c761af007577 with SHA-1 3f733506 is already in history

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



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