Merge "Add a service to rank apps for ResolverActivity." into oc-dev am: 6df90fa53b
am: 8b0979666a

Change-Id: I2761e5ed453ee87649fa07d66a2a749116bc5b95