Revert "Revert "Track cm opt/telephony""

This reverts commit cff6a94d5d2f199ce14fbbfa708e21e0372c9f86.