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

Change-Id: I5db4b761cd398bb5b2aed8e3316427b8acb73923