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

Change-Id: Ie20ead7404d1f200785104d896129212d126d9e7