[Android] Add serial comma to page info >2 permissions

Bug: 1077766
Change-Id: I818717294f62843b4489d0e99b38dcd764760342
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2410874
Commit-Queue: Ehimare Okoyomon <eokoyomon@chromium.org>
Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807235}

chrome/android/junit/src/org/chromium/chrome/browser/page_info/PageInfoPermissionsControllerUnitTest.java

@@ -77,13 +77,13 @@ public class PageInfoPermissionsControllerUnitTest {
                         "Sound allowed, Location blocked"},
                 {"Multiple Permissions Allowed",
                         Arrays.asList(LOCATION_ALLOWED, SOUND_ALLOWED, VR_ALLOWED),
-                        "Location, Sound and 1 more allowed"},
+                        "Location, Sound, and 1 more allowed"},
                 {"Multiple Permissions Blocked",
                         Arrays.asList(LOCATION_BLOCKED, SOUND_BLOCKED, VR_BLOCKED),
-                        "Location, Sound and 1 more blocked"},
+                        "Location, Sound, and 1 more blocked"},
                 {"Multiple Permissions Mixed",
                         Arrays.asList(LOCATION_ALLOWED, SOUND_BLOCKED, VR_BLOCKED),
-                        "Location, Sound and 1 more"}});
+                        "Location, Sound, and 1 more"}});
     }
 
     @Test

components/browser_ui/strings/android/browser_ui_strings.grd

@@ -454,13 +454,13 @@
         <ph name="PERMISSION_1">%1$s<ex>Location</ex></ph> and <ph name="PERMISSION_2">%2$s<ex>Sound</ex></ph> blocked
       </message>
       <message name="IDS_PAGE_INFO_PERMISSIONS_SUMMARY_MORE_MIXED" desc="Summary page info permissions string for more than 2 permissions, with a mix of allowed/blocked.">
-        <ph name="PERMISSION_1">%1$s<ex>Location</ex></ph>, <ph name="PERMISSION_2">%2$s<ex>Sound</ex></ph> and <ph name="NUM_MORE">%3$s<ex>2</ex></ph> more
+        <ph name="PERMISSION_1">%1$s<ex>Location</ex></ph>, <ph name="PERMISSION_2">%2$s<ex>Sound</ex></ph>, and <ph name="NUM_MORE">%3$s<ex>2</ex></ph> more
       </message>
       <message name="IDS_PAGE_INFO_PERMISSIONS_SUMMARY_MORE_ALLOWED" desc="Summary page info permissions string for more than 2 permissions, all allowed.">
-        <ph name="PERMISSION_1">%1$s<ex>Location</ex></ph>, <ph name="PERMISSION_2">%2$s<ex>Sound</ex></ph> and <ph name="NUM_MORE">%3$s<ex>2</ex></ph> more allowed
+        <ph name="PERMISSION_1">%1$s<ex>Location</ex></ph>, <ph name="PERMISSION_2">%2$s<ex>Sound</ex></ph>, and <ph name="NUM_MORE">%3$s<ex>2</ex></ph> more allowed
       </message>
       <message name="IDS_PAGE_INFO_PERMISSIONS_SUMMARY_MORE_BLOCKED" desc="Summary page info permissions string for more than 2 permissions, all blocked.">
-        <ph name="PERMISSION_1">%1$s<ex>Location</ex></ph>, <ph name="PERMISSION_2">%2$s<ex>Sound</ex></ph> and <ph name="NUM_MORE">%3$s<ex>2</ex></ph> more blocked
+        <ph name="PERMISSION_1">%1$s<ex>Location</ex></ph>, <ph name="PERMISSION_2">%2$s<ex>Sound</ex></ph>, and <ph name="NUM_MORE">%3$s<ex>2</ex></ph> more blocked
       </message>
       <message name="IDS_PAGE_INFO_INSTANT_APP_BUTTON" desc="Text in the button that opens an Android Instant app that is associated with the website's URL.">
         Open Instant App

components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_PERMISSIONS_SUMMARY_MORE_ALLOWED.png.sha1

-922c3132a13820a2a43e2ba5f762d3b6abdf7df7
\ No newline at end of file
+1318ad925d07f4068db9b4c221c79bd46a5eff3f
\ No newline at end of file

components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_PERMISSIONS_SUMMARY_MORE_BLOCKED.png.sha1

-9706763ffee06d9bd4ba8d79f0ebd89f4927ec3d
\ No newline at end of file
+26b79f2b7fc672cddbb3d04cfd48d4075625875c
\ No newline at end of file

components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_PERMISSIONS_SUMMARY_MORE_MIXED.png.sha1

-4bd3ee74502fcdd9cc2358b91c3ae0b9d4dec5fc
\ No newline at end of file
+4c609fe0133dc1ee0fb153e764efefbde0910cb2
\ No newline at end of file