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

Change-Id: I9383172f809a8b8ac979d1a43072641b5fcefd86