Merge "avatar: enhance developer experience" am: 5b6154fa am: 0de3f37b am: 5751f947

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



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