[automerger skipped] Merge "Correct the name of enum UserType item" am: 51af7130bf am: 9c01d142fc -s ours am: ab39e0da88 -s ours am: 351b5b549c -s ours

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

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

Change-Id: I742f27928af935ea70f48ecaa002d228a6e70eff
tree: 02370b92e495b8cf7f54bedc8731909201aa7093
  1. stats/