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

Change-Id: I45e96d0b5e88eb280e6dbc5981e6a6a7f1a4b6e2