Catch AssertionError in waitUntil()

If we get to the end of the timeout and the condition is still not met, an AssertionError gets thrown which doesn't inherit Exception, so it is not caught

Flag: TEST_ONLY
Bug: 374329315

Change-Id: I16ce0e42709ace478c8ca32eb0afda161663213e
2 files changed