[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 am: 9a391831 am: 81dafc06 -s ours

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

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



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