Use waitForHandlerAction for less busy waits

We can't completely replace waitUntilPhoneState with this because
handler actions sometimes occur besides transitioning into the expected
state, but we can replace waitForMs with this so that we don't wake
every 10 ms.

Bug: 78297012
Test: ran the test
Change-Id: I8d43b51a59f0c3fe9d47fe61e63742f3173925ff