Undo a fix and de-flake a test

* Undo an incorrect fix from previous CL (don't manually select a phone
acct)
* De-flake testOutgoingThenIncomingCalls -- the test apparatus wasn't
properly waiting for the second call to be added to the
InCallServiceFixture.
* Speculative attempt to de-flake CARSM tests

Test: unit
Bug: 69482930
Change-Id: I0ee89f25146e406fe73ceba4005564eeccd50177