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

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

Change-Id: I92d8e2748b7ce3954646236dcacb318185c7385a