Merge "Correct permission used for user related user restrictions." into udc-dev am: 396f8c52 am: 1c37e8cf am: b98aadbb am: 2ca26eec

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



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