Merge "AudioService: fix audio mode not reset to MODE_NORMAL"