Merge "Fixed how com.android.server.pm.Settings handle pre-created users." am: 8f0008900d am: 22ac3a45ea

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

Change-Id: I46453773f083eaa4e3a8988ee1a496d79f756dc7