Cleaned up dead code

Cleaned up dead code and simplified code path.

Test: Telephony sanity tests + unit tests
Bug: 73659459
Change-Id: I0c066d59f2fde9af315f4dabe0fe7b55600fa9f8
1 file changed