emulator: use google_apis_playstore image for chrome_public_test_apk on Pie.

Some of tests in chrome_public_test_apk requires play store to be installed.
The rest of test suites will stick with google_apis images,
as some of them need root permission to run tests.

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

infra/config/buckets/ci.star

@@ -38,6 +38,7 @@ ci.builder(
         'avd_configs': [
             'tools/android/avd/proto/generic_android23.textpb',
             'tools/android/avd/proto/generic_android28.textpb',
+            'tools/android/avd/proto/generic_playstore_android28.textpb',
         ],
     },
     schedule = '0 7 * * 0 *',

infra/config/generated/cr-buildbucket.cfg

@@ -5914,7 +5914,7 @@ buckets: <
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
-        properties_j: "avd_configs:[\"tools/android/avd/proto/generic_android23.textpb\",\"tools/android/avd/proto/generic_android28.textpb\"]"
+        properties_j: "avd_configs:[\"tools/android/avd/proto/generic_android23.textpb\",\"tools/android/avd/proto/generic_android28.textpb\",\"tools/android/avd/proto/generic_playstore_android28.textpb\"]"
       >
       execution_timeout_secs: 10800
       build_numbers: YES

testing/buildbot/chromium.android.fyi.json

@@ -6168,6 +6168,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": {
@@ -6200,11 +6201,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

@@ -334,10 +334,23 @@
         ],
       },
       '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',
+            },
+          ]
+        },
       },
     },
   },

tools/android/avd/proto/generic_playstore_android28.textpb

+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Configuration for a generic x86 android-28 AVD.
+
+emulator_package {
+  package_name: "chromium/third_party/android_sdk/public/emulator"
+  version: "lnt2Oz8NS73mAJL389R1QwgbM2qDSKNIRWTUOdmywukC"
+  dest_path: ".emulator_sdk"
+}
+
+system_image_package {
+  package_name: "chromium/third_party/android_sdk/public/system-images/android-28/google_apis_playstore/x86"
+  version: "aHLrqkrOa04ksjgo_LhSRx9V9P_FKxFqEJohj9cYsBUC"
+  dest_path: ".emulator_sdk"
+}
+system_image_name: "system-images;android-28;google_apis_playstore;x86"
+
+avd_package {
+  package_name: "chromium/third_party/android_sdk/public/avds/android-28/google_apis_playstore/x86"
+  version: "YsRCl6xqnPtiinkxCEa1QDLLJNjWWlwTwUsaBLvuEscC"
+  dest_path: ".android"
+}
+avd_name: "android_28_google_apis_playstore_x86"
+
+avd_settings {
+  screen {
+    density: 480
+    height: 1920
+    width: 1080
+  }
+}