Merge "Correct the name of enum UserType item" am: 51af7130bf

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

Change-Id: Ie3e4e8f29918df55cccc294cd9c3492484952358