Merge "Merge "Correct permission used for user related user restrictions." into udc-dev am: 396f8c52 am: 30cc9b87" into udc-d1-dev-plus-aosp am: 5047eecf am: 0cfec70a

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



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