Merge "Fix audio state issue for MT IMS call" am: bc7f1814b2
am: 7f998daee3

Change-Id: Ia372ea4d89c41d43ddd40b4eeacdb005e64009b0