[infra] Fix Windows OS dimension to match main branch

Change-Id: Ib880a979354e467190163c9f77e611617584e8b7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/644876
Reviewed-by: Leandro Lovisolo <lovisolo@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
index 10aba84..2b6dbc5 100644
--- a/infra/bots/gen_tasks_logic/gen_tasks_logic.go
+++ b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
@@ -761,7 +761,7 @@
 			"Mac12":      "Mac-12",
 			"Ubuntu18":   "Ubuntu-18.04",
 			"Win":        DEFAULT_OS_WIN,
-			"Win10":      "Windows-10-19045.2486",
+			"Win10":      "Windows-10-19045",
 			"Win2019":    DEFAULT_OS_WIN,
 			"Win8":       "Windows-8.1-SP0",
 			"iOS":        "iOS-13.3.1",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 6cb0593..0988d87 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -26605,7 +26605,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -26709,7 +26709,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -26808,7 +26808,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -26912,7 +26912,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -27011,7 +27011,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -27823,7 +27823,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -27927,7 +27927,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -28031,7 +28031,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-31.0.101.2115",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -28135,7 +28135,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-31.0.101.2115",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -28239,7 +28239,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-31.0.101.2115",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -28343,7 +28343,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-26.20.100.7463",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -28447,7 +28447,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-26.20.100.7463",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -28551,7 +28551,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-26.20.100.7463",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -28655,7 +28655,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -28759,7 +28759,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -28863,7 +28863,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-26.21.14.4120",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -28967,7 +28967,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-26.21.14.4120",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -29071,7 +29071,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-26.21.14.4120",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -29175,7 +29175,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -29279,7 +29279,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -29383,7 +29383,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -29487,7 +29487,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-27.21.14.5671",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -29591,7 +29591,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-27.21.14.5671",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -29695,7 +29695,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-27.21.14.5671",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -48909,7 +48909,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -49013,7 +49013,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -49117,7 +49117,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -49221,7 +49221,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -49325,7 +49325,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -49429,7 +49429,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -50573,7 +50573,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-i7-5557U",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -50677,7 +50677,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -50781,7 +50781,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -50885,7 +50885,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -50989,7 +50989,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -51093,7 +51093,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-31.0.101.2115",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -51197,7 +51197,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-31.0.101.2115",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -51301,7 +51301,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-31.0.101.2115",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -51405,7 +51405,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-31.0.101.2115",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -51509,7 +51509,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-31.0.101.2115",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -51613,7 +51613,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-31.0.101.2115",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -51717,7 +51717,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-31.0.101.2115",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -51821,7 +51821,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-26.20.100.7463",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -51925,7 +51925,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-26.20.100.7463",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -52029,7 +52029,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-26.20.100.7463",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -52133,7 +52133,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-26.20.100.7463",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -52237,7 +52237,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-26.20.100.7463",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -52341,7 +52341,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-26.20.100.7463",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -52445,7 +52445,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-26.20.100.7463",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -52549,7 +52549,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-26.20.100.7463",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -52653,7 +52653,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -52757,7 +52757,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -52861,7 +52861,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -52965,7 +52965,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -53069,7 +53069,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-26.21.14.4120",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -53173,7 +53173,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-26.21.14.4120",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -53277,7 +53277,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-26.21.14.4120",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -53381,7 +53381,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-26.21.14.4120",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -53485,7 +53485,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-26.21.14.4120",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -53589,7 +53589,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-26.21.14.4120",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -53693,7 +53693,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -53797,7 +53797,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -53901,7 +53901,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -54005,7 +54005,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -54109,7 +54109,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -54213,7 +54213,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -54317,7 +54317,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -54421,7 +54421,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-26.20.13031.18002",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -54525,7 +54525,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-27.21.14.5671",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -54629,7 +54629,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-27.21.14.5671",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -54733,7 +54733,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-27.21.14.5671",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -54837,7 +54837,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-27.21.14.5671",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -54941,7 +54941,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-27.21.14.5671",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {
@@ -55045,7 +55045,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-27.21.14.5671",
-        "os:Windows-10-19045.2486",
+        "os:Windows-10-19045",
         "pool:Skia"
       ],
       "environment": {