This reverts commit 81d7cece. Reason for revert: The telephony unit tests are fixed. Bug: 148282682 Change-Id: Ib835f0abf4faf33ea3a54420c84c1f8383d663c3