[automerger skipped] Merge "eatt: Fix eatt device duplicate" into tm-qpr-dev...

[automerger skipped] Merge "eatt: Fix eatt device duplicate" into tm-qpr-dev am: 5f1ff882 -s ours am: 5da9afa6 -s ours

am skip reason: Merged-In I614d1b258ffed6554ea52da78815f871946bb86f with SHA-1 e43e289a is already in history

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



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