[conflict] Merge "Add validation on service attrs in bta_sdp_act.cc" into...

[conflict] Merge "Add validation on service attrs in bta_sdp_act.cc" into tm-dev am: 9f7427d7 am: 904e5804 am: 4e4ccdbc

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



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