Merge "avatar: update tests after the bumble server move" am: 52f024b8

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



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