Merge "Cleanup voip-common API usage in Telephony." am: ade545edb6 am: 4a80a42875

Change-Id: I6ff7661320a908167d9b30a5ac1f59731893ae89