Merge "AudioService: fix mismatch in device volume index for alias streams" into nyc-mr2-dev
am: a33630fbbe

Change-Id: I890c2f5a723d4fca4e6bf0caa4cbd2597ba84912