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

Change-Id: I0b6206e6b24e16d87050fe33437e2766a9e19b04