Merge "Cleanup hidden API usage of voip-common." am: 99e2077364 am: 5fa96964d8 am: fe0710c440

Change-Id: Iea99e77cec09e7fdceba411e9e8c41890f1b3337