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

Change-Id: I667b1f9d07305d58f921280f8b8fe9ede0aeea1e