Merge "[Avatar Test] Remove duplicate device record" am: feb73d48 am:...

Merge "[Avatar Test] Remove duplicate device record" am: feb73d48 am: 497d09e4 am: 630a45dc am: 83b1158a

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



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