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

Change-Id: I84ac856c1838184e2ce819e5f637f2f97cdacbf6