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

Merge "[conflict] Disable the `freeze le l2cap randomly` feature am: 1415f2e2 am: 6df58ef4" into tm-d1-dev-plus-aosp am: b53b64dc am: 46b3b98c

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



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