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

Change-Id: I2a5bf391568c11b2bada8d92c1fa264ed11551da