Merge "avatar: hotfixes to `avatar.sh` script" am: c7c0511c am: b8b10fa0...

Merge "avatar: hotfixes to `avatar.sh` script" am: c7c0511c am: b8b10fa0 am: 8b3013d4 am: 5f3210a9

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



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