[automerger skipped] Merge "[conflict resolved] Merge "Add validation on sdp attributes in bta_av_act.cc" into tm-dev am: be6cf234 am: 1f136b06 am: 9b8c9970 am: 02a69d4c" into udc-d1-dev-plus-aosp am: 1d20f397 -s ours

am skip reason: Merged-In I5286fabf49f14cba5ef65a79d6e1eadb40bbb514 with SHA-1 d4c50d11 is already in history

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



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