Merge "Properly set VOIP audio mode for incoming calls"
am: ade1a55a0e

Change-Id: I8a12eab00fa8717bf4ef13a69b1f1b72097c08e1