Merge "Correct the name of enum UserType item" into rvc-dev am: 06cfd499 am: 0e5f3891 am: c0012748 am: 13900e4b

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

Change-Id: I0326972966257818aeac797b4c95394d34d5c94a