[Android] Fix a custom search engine bounces when it selected and unselected as default engine

chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java

Index: chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
index 85a498e83bf5a2b06ccf78df96ddcc6802a1caf2..9fb115595b264ddefdd214970aa51f38e033cddc 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
@@ -119,9 +119,8 @@ public class TemplateUrlService {
         public boolean equals(Object other) {
             if (!(other instanceof TemplateUrl)) return false;
             TemplateUrl otherTemplateUrl = (TemplateUrl) other;
-            // Explicitly excluding mTemplateUrlType as that will change if the search engine is
-            // set as default.
             return mIndex == otherTemplateUrl.mIndex
+                    && mTemplateUrlType == otherTemplateUrl.mTemplateUrlType
                     && mIsPrepopulated == otherTemplateUrl.mIsPrepopulated
                     && TextUtils.equals(mKeyword, otherTemplateUrl.mKeyword)
                     && TextUtils.equals(mShortName, otherTemplateUrl.mShortName);