Merge "Fix CarAudioService test"