Merge "Update type of PermissionManager::resultToError"