[automerger skipped] Rework device policy user restrctions. am: 3ed359b5 am: 17a90fdd -s ours

am skip reason: Merged-In I504b16bbbac99ac731580247b57f55a9b213609f with SHA-1 3ed359b5 is already in history

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



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