Merge "[conflict] Disable the `freeze le l2cap randomly` feature am:...

Merge "[conflict] Disable the `freeze le l2cap randomly` feature am: 1415f2e2" into tm-dev-plus-aosp am: edbd0ef4 am: 7fdb2065

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



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