[Backport 2.x] fix flaky test - handle IllegalStateException and throw AssertionError to use assertbusy

[Backport 2.x] fix flaky test - handle IllegalStateException and throw AssertionError to use assertbusy #24344