am e5a25a76: am ad58ca67: Merge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev automerge: 50085fb
am e5a25a76: am ad58ca67: Merge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev automerge: 50085fb

* commit 'e5a25a7689d3b2c8f6e0a047f6dd27f9d6c19ae4':
  AudioService: handle stream mute by stream alias

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base