[automerger skipped] eatt: Handle L2CAP collision on EATT am: 09165b22 -s...

[automerger skipped] eatt: Handle L2CAP collision on EATT am: 09165b22 -s ours am: 227ac9b3 -s ours

am skip reason: Merged-In Iada26e11de5b1e2631389e280417a4616d3795cd with SHA-1 e3929d79 is already in history

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



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