More clean up for ril and telephony

Change-Id: I99639c8db8cf28fe6794a5741d6e7d5412e25058