Merge "Remove two unused variables from CarAudioService"