Merge "avatar: disable failing Gatt test" am: b27fe126 am: 6d1590de am:...

Merge "avatar: disable failing Gatt test" am: b27fe126 am: 6d1590de am: b2097f09 am: 65e663de

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



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