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

Change-Id: I113896c5d49013da01cdafcc3b5ea0d314e67096