Merge "AudioService: Fix volume control during ringtone" into main