Merge "audio policy: rescale volume index in setStreamVolumeIndex"