Merge "Add PrintRecommendationService to hidden API package whitelist" into pi-dev