Merge "Merge "Correct the name of enum UserType item" into rvc-dev am: 06cfd499 am: cd463e41 am: aaa58fd8" into rvc-qpr-dev-plus-aosp am: 3b78c6e9

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

Change-Id: Id35a5c319d46f663d0f6565d240ec7291a44d319