Revert "Increase the test timeout used when waiting for events to be traced" This reverts commit 59a530dcf4442de993f93c8d7559813dd6274fcb. Reason for revert: b/323347575 Change-Id: Ia9f2d5986dfc945b2ffa6b6395dbc225f762cda1