Merge "Fix flaky onReceiveTimeoutIntent_finishesActivity" into main am: f900cb78

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



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