Merge "AudioPolicy: setVolumeIndexForAttributes tightening"