Merge "avatar: multiple hot-fixes" am: e54a5b04 am: 4111dbdd am: e9365c00

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



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