Merge "Changed parameters in setDevicePolicyUserRestriction"