resolve merge conflicts of 3c002e45dda1 to oc-dev-plus-aosp

Test: Trivial resolution
Change-Id: Ifc41cc692406d52f508b595465f4f7469f74c6f5

diff --cc api/system-current.txt
Simple merge

diff --cc packages/PrintRecommendationService/src/com/android/printservice/recommendation/RecommendationServiceImpl.java
index 9436bd2,e18ee90..128ed50
--- 1/packages/PrintRecommendationService/src/com/android/printservice/recommendation/RecommendationServiceImpl.java
--- 2/packages/PrintRecommendationService/src/com/android/printservice/recommendation/RecommendationServiceImpl.java
+++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/RecommendationServiceImpl.java
@@@ -17,12 -17,11 +17,12 @@@
  package com.android.printservice.recommendation;
  
  import android.content.res.Configuration;
+ import android.printservice.PrintService;
  import android.printservice.recommendation.RecommendationInfo;
  import android.printservice.recommendation.RecommendationService;
- import android.printservice.PrintService;
  import android.util.Log;
  
 +import com.android.printservice.recommendation.plugin.google.CloudPrintPlugin;
  import com.android.printservice.recommendation.plugin.hp.HPRecommendationPlugin;
  import com.android.printservice.recommendation.plugin.mdnsFilter.MDNSFilterPlugin;
  import com.android.printservice.recommendation.plugin.mdnsFilter.VendorConfig;