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

Change-Id: Id759c56f0804d995c2cb06a069dbe93cad882ba5