Make test more resilient to things taking longer.

Since we're using the the job queue more the update tests have to be a bit
more willing to wait for the changes that they expect to take place.

Bug: 55848
Change-Id: I8099fc37b9f48d907b4252375329cb0905408545
Merge "Make test more resilient to things taking longer."