Merge changes from topic "avatar_refactor_update" am: 9241c8f0 am: d6f268d4

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



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