Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev am: 925d3cf211
am: 1a297e53dc

Change-Id: Ie44cd313255d95e583657829448fd83decfaa10b