Merge "Revert "Extending systemUserOnly attribute to Providers and Services"" into main