Merge "Merge "Ensure self-managed calls use voip audio mode." am: b62aa315d1 am: fd3e10b1bc" into pi-dev-plus-aosp
am: 6823c8a822

Change-Id: I1352a44cbb55fdeeb79771b27055a70b83a3cbb8