Merge "Small refactor AudioDeviceVolumeManager in AudioService" into main