[automerger skipped] Merge "Eatt: Improve colision handling" into tm-qpr-dev am: f6d71e1a -s ours

am skip reason: Merged-In Iff0818bbef1a684f7cb1740584a14c9457a3cde1 with SHA-1 5c6f21c9 is already in history

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



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