Merge "AudioPolicyManager: fix setStreamVolumeIndex()." into nyc-mr1-dev am: 3b0515db34 am: 0c0e490b6f
am: 9f9a146338

Change-Id: Ic5519887b41b43b95300cb1fe2f6673b8916b4f1