Merge "Select a system audio route only when needed" into oc-mr1-dev am: d4aee713d4
am: cf874bbe6f

Change-Id: I79a44736931cea34eb6d00a62ae33b569021e9e4