Shorten the timeout on update tests

We used to wait a long time but that was pretty silly.

Also add a note about why these tests are sometimes flakey.  I don't
have a way to make them unflakey right now and they are useful so they
will still run.

Change-Id: I549d15a81395fd76f26669710198243a3f329daf