Merge changes I4d700bc4,I14fdac19,I66159f36 into udc-dev

* changes:
  Always sync user restriction state to UserManager
  Fix issue with upgrading from previous user versions.
  Properly store device policy user restrictions.