+Revert "Revert "Revert "Track cm opt/telephony"""

This reverts commit 5da833cbfb35c2578469b50f655389c4b4b93d23.