Revert "Partial Revert of ag/10161061"

This reverts commit 81d7cece57540d61ea16d2d33f253b474d60a963.

Reason for revert: The telephony unit tests are fixed.
Bug: 148282682

Change-Id: Ib835f0abf4faf33ea3a54420c84c1f8383d663c3
2 files changed