[automerger skipped] Merge "Do not perform SSR when avdtp start" into tm-dev...

[automerger skipped] Merge "Do not perform SSR when avdtp start" into tm-dev am: 29937fd3 -s ours am: e127b8d0 -s ours am: 912f5667 -s ours

am skip reason: Merged-In Id6f983aadc78af11cd3e21ee727e0bb207291ad2 with SHA-1 1c4b97bd is already in history

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



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