Merge "Correct permission used for user related user restrictions." into...

Merge "Correct permission used for user related user restrictions." into udc-dev am: 396f8c52 am: 30cc9b87 am: 771907f9 am: c48ae907

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



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