[automerger skipped] Merge "Increase the broadcast timeout duration in the tests." into main am: f6b0c5d0eb -s ours

am skip reason: Merged-In Ic3456f0711d09a5d1e5549a326ad056bde939546 with SHA-1 dcd5c460ab is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2842994

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