Merge "Add a service to rank apps for ResolverActivity." into oc-dev