Refine delay polling control flow

Bug: 231411134
Test: manual
Change-Id: I3371d1b321b0cc37f7deaabbc743cdf456bd2b23
1 file changed