Cleanup in preparation for the NOCIB refactor

Move a few classes around and split large methods to prepare for the
NewOutgoingCallIntentBroadcaster refactor to improve the async flow.

Test: unit, manual
Bug: 123904954
Change-Id: I10fcba635be5fb6823e0a423a7d248a014080e40
5 files changed