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: I2981f7412d2dc694f1bece3e2f5102b538fdc34a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>