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

Change-Id: Ib3e627f384809fb470b9a42aa2ce367cc4d1f1d1