Merge "Add PROPERTY_VOIP_AUDIO_MODE to android.telecom.Call." am: cc690e9a48
am: f2dc5a204a

Change-Id: I39dd19c1c09b15136460854fd0e5a2b8161766c3