Merge "Moves car_audio_configuration.xml out of CarService package"