Merge "Merge "Ensure self-managed calls use voip audio mode." am: b62aa315 am: fd3e10b1" into pi-dev-plus-aosp