[automerger skipped] [conflict resolved] Merge "Add validation on sdp...

[automerger skipped] [conflict resolved] Merge "Add validation on sdp attributes in bta_ag_sdp.cc" into tm-dev am: b4aaf94b am: 5dea751e am: e97b8eb2 am: 4c35207e am: 39782fc3 am: 3f733506 -s ours

am skip reason: Merged-In I51c0215125808102b6cff880357d19012ffc37b9 with SHA-1 33334f0d is already in history

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



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