Merge "Revert "Revert "Extending systemUserOnly attribute to Providers ..."" into main