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

Change-Id: I427c8c589c4b1a923ed455e71cf4813348135279