emulator: Add AVD config files for android-11

Also update android-10 AVD to include the fix in crrev.com/c/2486288

Bug: 1137474
Change-Id: I29402c7bd083f97d322cf0db37e272216a332092
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2490267
Auto-Submit: Haiyang Pan <hypan@google.com>
Reviewed-by: benjamin joyce <bjoyce@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#819986}

tools/android/avd/proto/generic_android29.textpb

@@ -2,7 +2,7 @@
 # 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-29 AVD.
+# Configuration for a generic x86 android-29 AVD (userdebug build).
 
 emulator_package {
   package_name: "chromium/third_party/android_sdk/public/emulator"
@@ -19,7 +19,7 @@ system_image_name: "system-images;android-29;google_apis;x86"
 
 avd_package {
   package_name: "chromium/third_party/android_sdk/public/avds/android-29/google_apis/x86"
-  version: "wX4wuDUxtl_JjP8-4bnYhdgg8_m-GMGomWFSXKB8SpgC"
+  version: "cNMmoJNE7zpvPqfK98csJ4HL2uJPwwcZUgHaI7vks8oC"
   dest_path: ".android"
 }
 avd_name: "android_29_google_apis_x86"

tools/android/avd/proto/generic_android30.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-30 AVD (userdebug build).
+
+emulator_package {
+  package_name: "chromium/third_party/android_sdk/public/emulator"
+  version: "lcFZFeb_iFtXXguUl1Bq-NOl9zqYh1urBlxF924akmcC"
+  dest_path: ".emulator_sdk"
+}
+
+system_image_package {
+  package_name: "chromium/third_party/android_sdk/public/system-images/android-30/google_apis/x86"
+  version: "VlHrJlRzoBJr_TnKKVh6d22nJ_9lXE6GeVMNPXix5AkC"
+  dest_path: ".emulator_sdk"
+}
+system_image_name: "system-images;android-30;google_apis;x86"
+
+avd_package {
+  package_name: "chromium/third_party/android_sdk/public/avds/android-30/google_apis/x86"
+  version: "Bud8SmWeJxzNJOoetfm0FST9ZBHI2h_J4uUMEasVdV4C"
+  dest_path: ".android"
+}
+avd_name: "android_30_google_apis_x86"

tools/android/avd/proto/generic_playstore_android30.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-30 AVD with playstore (user build).
+
+emulator_package {
+  package_name: "chromium/third_party/android_sdk/public/emulator"
+  version: "lcFZFeb_iFtXXguUl1Bq-NOl9zqYh1urBlxF924akmcC"
+  dest_path: ".emulator_sdk"
+}
+
+system_image_package {
+  package_name: "chromium/third_party/android_sdk/public/system-images/android-30/google_apis_playstore/x86"
+  version: "fueHa-G5JHEqRY3uETtXr91GnRZlDW9W03BtTPPrzDsC"
+  dest_path: ".emulator_sdk"
+}
+system_image_name: "system-images;android-30;google_apis_playstore;x86"
+
+avd_package {
+  package_name: "chromium/third_party/android_sdk/public/avds/android-30/google_apis_playstore/x86"
+  version: "c33inxhADKqeNPF45ieyfOvthbHHVOr-OMJDNRkwjKkC"
+  dest_path: ".android"
+}
+avd_name: "android_30_google_apis_playstore_x86"