Properly store device policy user restrictions. am: c747c3fd

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



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