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

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

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



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