[automerger skipped] Merge "[conflict] Disable the `freeze le l2cap randomly`...

[automerger skipped] Merge "[conflict] Disable the `freeze le l2cap randomly` feature am: 1415f2e2 am: 6df58ef4 am: 0ead894d" into tm-qpr-dev-plus-aosp am: 186c4ce7 -s ours

am skip reason: Merged-In Ie2c9987cf14f6ae0ffa84203cb2743943567f224 with SHA-1 bfb2477e is already in history

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



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