Merge "Fix flaky onReceiveTimeoutIntent_finishesActivity" into main am: f900cb78 am: f51d1a5b

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



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