[automerger skipped] Merge "System UserInfo flags are set in UserTypeFactory"...

[automerger skipped] Merge "System UserInfo flags are set in UserTypeFactory" into udc-dev am: 7cbe11f9 am: 43725f59 -s ours

am skip reason: Merged-In I759409d907120043f20b2341655a65cb372a0d21 with SHA-1 db675161 is already in history

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



Change-Id: I62ff4e522d51c029d979fbb4376a49ba9f0bb552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>