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

Change-Id: I3ec6904f25d4d9cd172cb2d3ff60af2969cb47ea