Merge changes from topic "am-947d75e4c07e4d08851a7e954019af90" into main

* changes:
  Merge changes I4d700bc4,I14fdac19,I66159f36 into udc-dev am: 430789ea am: da090079
  [automerger skipped] Fix issue with upgrading from previous user versions. am: f0d456b0 am: 049fee2c -s ours
  [automerger skipped] Properly store device policy user restrictions. am: c747c3fd am: 24249d7d -s ours