emulator: apply playstore image to NSOOP_chrome_public_test_apk

Bug: 1057150
Change-Id: I0506b69083f327f7f4fcb40005d8828f2e004888
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2083438Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#746278}

testing/buildbot/chromium.android.fyi.json

@@ -6233,6 +6233,7 @@
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices",
           "--avd-config=../../tools/android/avd/proto/generic_android28.textpb",
+          "--avd-config=../../tools/android/avd/proto/generic_playstore_android28.textpb",
           "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.chrome_public_test_apk.filter"
         ],
         "merge": {
@@ -6266,11 +6267,11 @@
           ],
           "named_caches": [
             {
-              "name": "avd_generic_android28",
+              "name": "avd_generic_playstore_android28",
               "path": ".android"
             },
             {
-              "name": "system_images_android_28_google_apis_x86",
+              "name": "system_images_android_28_google_apis_playstore_x86",
               "path": ".emulator_sdk"
             }
           ],

testing/buildbot/test_suite_exceptions.pyl

@@ -1603,10 +1603,23 @@
     ],
     'modifications': {
       'android-pie-x86-fyi-rel': {
-        # https://crbug.com/1046059
         'args': [
+          '--avd-config=../../tools/android/avd/proto/generic_playstore_android28.textpb',
+          # https://crbug.com/1046059
           '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.chrome_public_test_apk.filter',
         ],
+        'swarming': {
+          'named_caches': [
+            {
+              'name': 'avd_generic_playstore_android28',
+              'path': '.android',
+            },
+            {
+              'name': 'system_images_android_28_google_apis_playstore_x86',
+              'path': '.emulator_sdk',
+            },
+          ]
+        },
       },
     },
   },