Merge "Add waiting timeout in test to fix flakiness" into main am: 51bfbbfc

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



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