Merge "Fix name of Samsung in PrintServiceRecommendationService." into nyc-dev