Revert "Remove timeout from waitForBroadcastIdle to improve spikiness."

This reverts commit 1e48634ca823abc247b94650eff4c6f08a9a6aa0.

Reason for revert: Possible cause for these spikes https://screenshot.googleplex.com/4BiHCKud3vo9dbY

Change-Id: Id93aaa08df4eb0bdb44569eb4f148bee744447d6
1 file changed