Merge "Speaker channel swapping is conditional to audio mode" into nyc-mr1-dev am: 09fef3caf5
am: 955dee58ee

Change-Id: I1333f1be12210047b27b0894064f0246b8ca553e