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

Change-Id: I8212a9e20b3225c7d3f579f0c8c5ea4fb375e25f