Fix AppThemeColorProvider for GridTabSwitcher

isTabGroupsAndroidEnabled() implies isGridTabSwitcherEnabled(), and all
callers of isGridTabSwitcherEnabled() should also check
isTabGroupsAndroidEnabled().

There's no visual difference because all the affected code paths are
in the bottom toolbar, which is force disabled when
isTabGroupsAndroidEnabled() is on.

Bug: None
Change-Id: I35542d90c7c5e8c1d3c9c9effd7567e16e3f088e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1594734Reviewed-by: Becky Zhou <huayinz@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659759}

chrome/android/java/src/org/chromium/chrome/browser/toolbar/AppThemeColorProvider.java

@@ -84,7 +84,8 @@ public class AppThemeColorProvider extends ThemeColorProvider implements Incogni
         final boolean isAccessibilityEnabled = DeviceClassManager.enableAccessibilityLayout();
         final boolean isHorizontalTabSwitcherEnabled =
                 ChromeFeatureList.isEnabled(ChromeFeatureList.HORIZONTAL_TAB_SWITCHER_ANDROID);
-        final boolean isTabGridEnabled = FeatureUtilities.isGridTabSwitcherEnabled();
+        final boolean isTabGridEnabled = FeatureUtilities.isGridTabSwitcherEnabled()
+                || FeatureUtilities.isTabGroupsAndroidEnabled();
         final boolean shouldUseIncognitoBackground = mIsIncognito
                 && (isAccessibilityEnabled || isHorizontalTabSwitcherEnabled || isTabGridEnabled
                         || !mIsOverviewVisible);