[automerger skipped] Merge "Increase the broadcast timeout duration in the...

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

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

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



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