Adding search_client_id which includes the "ms-" or "tablet-" client-id prefix, set in GooglePartnerSetup.
Retaining client-id (which does not include the client-id prefix) for legacy purposes, if Browser is used with an older version of GooglePartnerSetup.

Bug #3483276

Change-Id: Ice4788ef78f4b58c5d981b50d5248aa51a53733d
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6eb13e3..28fe407 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -817,10 +817,10 @@
             user signs up the device with a Google sites account, the site's
             domain will be appended. -->
     <string name="homepage_base" translatable="false">
-        http://www.google.com/webhp?client=ms-{CID}&amp;source=android-home</string>
+        http://www.google.com/webhp?client={CID}&amp;source=android-home</string>
     <!-- The default url for the instant_base_page. -->
     <string name="instant_base" translatable="false">
-        http://www.google.com/webhp?client=ms-{CID}&amp;source=android-omnibox-instant&amp;ion=1</string>
+        http://www.google.com/webhp?client={CID}&amp;source=android-omnibox-instant&amp;ion=1</string>
 
     <!-- Bookmarks -->
     <string-array name="bookmarks" translatable="false">