[automerger skipped] Merge "Fixed how com.android.server.pm.Settings handle pre-created users." am: 8f0008900d am: 22ac3a45ea am: 8a027191d2 am: 875cba236d -s ours

am skip reason: Change-Id I6cd17ac588a4d95bf0ea704dd18387e19eeab374 with SHA-1 4c789e0168 is in history

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

Change-Id: I72f3c9c8ad212eddb23f9001475e5ee5ac4c91cc