Merge "Reduce test flakyness" into tm-qpr-dev am: f66923d9

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



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