Merge "Remove deadlock between Telecom and Telephony"
am: 0fb9f89ca4

Change-Id: I9412cc03838705bae80087aafd988a20ac0001e4