[pinpoint] update various references to android-pixel6 config details

Bug: chromium:1520496
Change-Id: I7f68e40cd8d0116681acd9055c68504893cdf1cc
Reviewed-on: https://chromium-review.googlesource.com/c/catapult/+/5224442
Reviewed-by: John Chen <johnchen@chromium.org>
Commit-Queue: Sean McCullough <seanmccullough@google.com>
Reviewed-by: Wenbin Zhang <wenbinzhang@google.com>
diff --git a/dashboard/dashboard/pinpoint/elements/jobs-page/new-job-fab.html b/dashboard/dashboard/pinpoint/elements/jobs-page/new-job-fab.html
index fb0d5f0..4a77f50 100644
--- a/dashboard/dashboard/pinpoint/elements/jobs-page/new-job-fab.html
+++ b/dashboard/dashboard/pinpoint/elements/jobs-page/new-job-fab.html
@@ -793,7 +793,7 @@
         } else if (configuration === 'android-pixel2-perf-pgo') {
           return 'performance_test_suite_android_clank_monochrome_64_32_bundle';
         } else if (configuration === 'android-pixel4-perf') {
-          return 'performance_test_suite_android_clank_trichrome_bundle';
+          return 'performance_test_suite_android_clank_trichrome_chrome_google_64_32_bundle';
         } else if (configuration === 'android-pixel4-perf-pgo') {
           return 'performance_test_suite_android_clank_trichrome_bundle';
         } else if (configuration === 'android-pixel4a_power-perf') {
@@ -801,7 +801,7 @@
         } else if (configuration === 'android-pixel4a_power-perf-pgo') {
           return 'performance_test_suite_android_clank_trichrome_bundle';
         } else if (configuration.startsWith('android-pixel6')) {
-          return 'performance_test_suite_android_clank_trichrome_bundle';
+          return 'performance_test_suite_android_clank_trichrome_chrome_google_64_32_bundle';
         } else if (configuration === 'android-new-pixel-perf') {
           return 'performance_test_suite_android_clank_trichrome_chrome_google_64_32_bundle';
         } else if (configuration === 'android-new-pixel-pro-perf') {
diff --git a/dashboard/dashboard/pinpoint/handlers/new.py b/dashboard/dashboard/pinpoint/handlers/new.py
index 6d4cdc5..e9418d0 100644
--- a/dashboard/dashboard/pinpoint/handlers/new.py
+++ b/dashboard/dashboard/pinpoint/handlers/new.py
@@ -518,7 +518,7 @@
   if bot_name in ['android-pixel4-perf', 'android-pixel4-perf-pgo']:
     return 'performance_test_suite_android_clank_trichrome_bundle'
   if bot_name in ['android-pixel6-perf', 'android-pixel6-perf-pgo']:
-    return 'performance_test_suite_android_clank_trichrome_bundle'
+    return 'performance_test_suite_android_clank_trichrome_chrome_google_64_32_bundle'
   if bot_name in ['android-pixel6-pro-perf', 'android-pixel6-pro-perf-pgo']:
     return 'performance_test_suite_android_clank_trichrome_bundle'
   if 'android' in bot_name.lower():
diff --git a/dashboard/dashboard/pinpoint_request.py b/dashboard/dashboard/pinpoint_request.py
index 82eb6d0..9a27796 100644
--- a/dashboard/dashboard/pinpoint_request.py
+++ b/dashboard/dashboard/pinpoint_request.py
@@ -186,13 +186,13 @@
   if bot_name == 'android-pixel2-perf':
     return 'performance_test_suite_android_clank_monochrome_64_32_bundle'
   if bot_name == 'android-pixel4-perf':
-    return 'performance_test_suite_android_clank_trichrome_bundle'
+    return 'performance_test_suite_android_clank_trichrome_chrome_google_64_32_bundle'
   if bot_name == 'android-pixel4a_power-perf':
     return 'performance_test_suite_android_clank_trichrome_bundle'
   if bot_name == 'android-pixel6-perf':
-    return 'performance_test_suite_android_clank_trichrome_bundle'
+    return 'performance_test_suite_android_clank_trichrome_chrome_google_64_32_bundle'
   if bot_name == 'android-pixel6-pro-perf':
-    return 'performance_test_suite_android_clank_trichrome_bundle'
+    return 'performance_test_suite_android_clank_trichrome_chrome_google_64_32_bundle'
   if bot_name == 'android-samsung-foldable-perf':
     return 'performance_test_suite_android_clank_trichrome_bundle'
   if 'android' in bot_name.lower():