[conflict] Disable the `freeze le l2cap randomly` feature am: 1415f2e2 am: 6df58ef4

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



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