Merge "Expose new Telecom APIs for use by Telephony" am: fd191d895e
am: 5defb332c9

Change-Id: I0bd66f496e0c9bdc40fbb5f970628d745fa2472f