Merge "Properly set VOIP audio mode for incoming calls" into pi-dev am: b851b049c1
am: 7dd82c81c8

Change-Id: Ic59c63921a5abbb001a87451ae7d8b7ee8c459d6