Merge "[PTS-bot] Use global retry count" am: 015d8668 am: 32aec31b am:...

Merge "[PTS-bot] Use global retry count" am: 015d8668 am: 32aec31b am: 085b53c2 am: 506bd298

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



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