Merge "Update PermissionManagerService to handle pre-created users"