Merge "Add voip audio mode configuration for ims call" am: a8482c0efa am: 26d55b85b3
am: 1055b8d4bc

Change-Id: Id3081649958c4f874276d3e673dddc74739a635d