Merge "Fixed how com.android.server.pm.Settings handle pre-created users."