Merge "Cleanup Telecom API usage in Telephony for mainline support."
am: c755dd83e5

Change-Id: I340527caf2d48d2169364173113fe40c40cef12a