Merge changes from topics "avatar-update-2", "re-enable-asha-tests" into main am: 8dc69002

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



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