Phone: implement noise suppression for phone calls (2/2) - resolved conflicts.

Change-Id: I52367a18aa6dc494332204615b6d05baa2c924b8