Fuck Me

Revert "Revert "Telephony: Squashed commits needed to use CM fw/opt/telephony""

This reverts commit fd3f52b9863fac2d05cc29657c07dcd9d393fca6.