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

Change-Id: I2027acf3f7713c2a906854f4c0f7339eef4a3f36