Merge "Ensure self-managed calls use voip audio mode." am: b62aa315d1
am: fd3e10b1bc

Change-Id: I8f7842fa84fcce91a292b32189cd827b4a125fb0