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

Change-Id: I3ab4514523373a8141eee38d1748b2af6d31f116