Merge "Car HAL uses "default" service name"