Merge "Merge "Expose additional fields needed by PrintRecommendationService...
Merge "Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev am: a1a1aa3c am: b5537f44" into nyc-mr1-dev-plus-aosp
am: a59092ab
* commit 'a59092ab':
Change-Id: Idf9e5f7313469b60156919593885f43922a6c850