Merge "Revert "Make PermPolicySvc based on uid""