[automerger skipped] Merge "Correct the name of enum UserType item" am:...

[automerger skipped] Merge "Correct the name of enum UserType item" am: 51af7130 am: 9c01d142 -s ours am: f593ec56 -s ours am: 5a5a6b96 -s ours am: d6db84b1 -s ours

am skip reason: Change-Id Ibefb4a9c03ae0bf3ea9cd2ce186223860aa42e74 with SHA-1 ad14a26c is in history

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

Change-Id: I2b797702edd478353ce01cc6d6af7da5f9d4e541