[ios] Update the iPad Pro naming to include 2nd gen.

Also add coverage for ios13 and ios14 on the ios14-sdk bot.

Ignore-CQ-Freeze: fyi bot only
Bug: 1110858
Change-Id: Iecde449afa5b1a9ae4035c61be82efb2b9bbc3ef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2327615
Commit-Queue: Lindsay Pasricha <lindsayw@chromium.org>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#793227}

testing/buildbot/test_suites.pyl

@@ -5704,10 +5704,10 @@
         'variants': [
           'SIM_IPHONE_7_13_6',
           'SIM_IPHONE_X_13_6',
-          'SIM_IPAD_PRO_13_6',
+          'SIM_IPAD_PRO_2ND_GEN_13_6',
           'SIM_IPAD_6_GEN_13_6',
           'SIM_IPHONE_X_12_4',
-          'SIM_IPAD_PRO_12_4',
+          'SIM_IPAD_PRO_2ND_GEN_12_4',
           'SIM_IPAD_6_GEN_12_4',
         ]
       },
@@ -5745,7 +5745,7 @@
           'SIM_IPHONE_X_13_6',
           'SIM_IPAD_AIR_2_13_6',
           'SIM_IPHONE_X_12_4',
-          'SIM_IPAD_PRO_12_4',
+          'SIM_IPAD_PRO_2ND_GEN_12_4',
           'SIM_IPAD_6_GEN_12_4',
         ]
       },
@@ -5825,12 +5825,14 @@
           # 14.0 Sims
           'SIM_IPHONE_X_14_0',
           'SIM_IPAD_AIR_2_14_0',
+          'SIM_IPAD_PRO_2ND_GEN_14_0',
           # 13.6 Sims
           'SIM_IPHONE_X_13_6',
           'SIM_IPAD_AIR_2_13_6',
+          'SIM_IPAD_PRO_2ND_GEN_13_6',
           # 12.4 Sims
           'SIM_IPHONE_X_12_4',
-          'SIM_IPAD_PRO_12_4',
+          'SIM_IPAD_PRO_2ND_GEN_12_4',
           'SIM_IPAD_6_GEN_12_4',
         ]
       },

testing/buildbot/variants.pyl

@@ -113,23 +113,23 @@
         ],
         'identifier': 'iPad Air (3rd generation) 14.0'
     },
-    'SIM_IPAD_PRO_12_4': {
+    'SIM_IPAD_PRO_2ND_GEN_12_4': {
         'args': [
           '--platform',
           'iPad Pro (12.9-inch)',
           '--version',
           '12.4',
         ],
-        'identifier': 'iPad Pro (12.9-inch) 12.4'
+        'identifier': 'iPad Pro (12.9-inch) (2nd generation) 12.4'
     },
-    'SIM_IPAD_PRO_13_6': {
+    'SIM_IPAD_PRO_2ND_GEN_13_6': {
         'args': [
           '--platform',
           'iPad Pro (12.9-inch)',
           '--version',
           '13.6',
         ],
-        'identifier': 'iPad Pro (12.9-inch) 13.6'
+        'identifier': 'iPad Pro (12.9-inch) (2nd generation) 13.6'
     },
     # In Xcode 12, "iPad Pro (12.9-inch)" requires a generation suffix in
     # "platform" arg.