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

Change-Id: I262357c1aa9a23270edc2f1b1df409840fbf626d