Merge "Merge "Move Xerox recommendation plugin to service." into nyc-dev am: e509dcb43f am: e498e847c8" into nyc-mr1-dev-plus-aosp