[automerger skipped] Properly store device policy user restrictions. am:...

[automerger skipped] Properly store device policy user restrictions. am: c747c3fd am: 24249d7d -s ours

am skip reason: Merged-In I66159f362b45d4c9e322754ff272c373b2557812 with SHA-1 24202a9b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25529244



Change-Id: I3c13e209bc2d952a6b14f1e7b5240e475a922508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>