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

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



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