[automerger skipped] Merge "Added UserInfo.convertedFromPreCreated" into rvc-qpr-dev am: 7d2354bdc5 am: 1488119306 -s ours

am skip reason: Change-Id Iee9df636db5677b4d968d49bb5f5b3fbb9a7f02d with SHA-1 c2aa0be065 is in history

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

Change-Id: I27875197f43cf1a56933401416071e089393b428