chromium.android.fyi: Tweak timeout/shards of Nougat tester (again).

testing/buildbot/chromium.android.fyi.json

 {
   "Android Tests (trial)(dbg)": {
     "gtest_tests": [
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "blink_heap_unittests"
       },
       {
@@ skipping 749 matching lines @@
             }
           ],
           "dimension_sets": [
             {
               "android_devices": "1",
               "device_os": "NRD91N",
               "device_type": "bullhead"
             }
           ],
           "expiration": 10800,
-          "hard_timeout": 1200,
+          "hard_timeout": 1500,
           "output_links": [
             {
               "link": [
                 "https://luci-logdog.appspot.com/v/?s",
                 "=android%2Fswarming%2Flogcats%2F",
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ],
-          "shards": 4
+          "shards": 6
         },
         "test": "android_webview_test_apk"
       },
       {
         "override_isolate_target": "android_webview_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ skipping 309 matching lines @@
             }
           ],
           "dimension_sets": [
             {
               "android_devices": "1",
               "device_os": "NRD91N",
               "device_type": "bullhead"
             }
           ],
           "expiration": 10800,
-          "hard_timeout": 960,
+          "hard_timeout": 1200,
           "output_links": [
             {
               "link": [
                 "https://luci-logdog.appspot.com/v/?s",
                 "=android%2Fswarming%2Flogcats%2F",
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ],
-          "shards": 4
+          "shards": 6
         },
         "test": "content_browsertests"
       },
       {
         "override_compile_targets": [
           "content_shell_test_apk"
         ],
         "override_isolate_target": "content_shell_test_apk",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
               "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
             }
           ],
           "dimension_sets": [
             {
               "android_devices": "1",
               "device_os": "NRD91N",
               "device_type": "bullhead"
             }
           ],
           "expiration": 10800,
-          "hard_timeout": 960,
+          "hard_timeout": 1200,
           "output_links": [
             {
               "link": [
                 "https://luci-logdog.appspot.com/v/?s",
                 "=android%2Fswarming%2Flogcats%2F",
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
-          ]
+          ],
+          "shards": 4
         },
         "test": "content_shell_test_apk"
       },
       {
         "override_isolate_target": "content_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ skipping 2139 matching lines @@
               "device_type": "gce_x86"
             }
           ],
           "hard_timeout": 960,
           "shards": 1
         }
       }
     ]
   }
 }