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

Change-Id: I16dd0108b6ddbfedab3a74fabbdb256fcce8660e