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

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



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