Merge "Add voip audio mode configuration for ims call" am: 4296aa3b2b
am: 06c65cc2a0

Change-Id: I0bcc55309ffd376a06dd8693a4d517695ae0240e