Merge "Properly store device policy user restrictions." into udc-qpr-dev