Merge "Rollback SHELL UID check for CarrierConfigLoader"