Revert "Track cm opt/telephony"

This reverts commit 65a4ac9a3ff5517f12a735ed1743778b573295b8.