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

Merge "Properly store device policy user restrictions." into udc-qpr-dev am: c0ba502a am: 36e4478c

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



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