Merge "Do not remove duplicate non-LE-only device records" into main am: be05f751

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



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