switch back to CM services/telephony for now

Change-Id: Ibe30c77049fa694e38678832dc2e6279301aa752