Merge "Update PermissionManagerService to handle pre-created users" into rvc-qpr-dev