Merge changes from topics "avatar-update-2", "re-enable-asha-tests" into main...

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

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



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