Merge "AudioDeviceVolumeManager and VolumeInfo API changes"