[automerger skipped] Merge "eatt: Handle L2CAP collision on EATT" into...

[automerger skipped] Merge "eatt: Handle L2CAP collision on EATT" into tm-d1-dev am: 21468f28 -s ours am: 36976d45 -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: I989732c2e2178fc168fc837fdbc3f7445d6b01f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>