[Mfill Android] Ensure borderless icons have white background in dark mode

The new borderless icons are based on transparency which works in all
places that have a white background. In some dark mode surfaces, some
dark icons have nearly no contrast. This looks bad, like shown in the
linked bug.

Therefore, this CL reintroduces the white backgrounds. The borders are
still gone on all surfaces.

Bug: 985318
Change-Id: I064b500934b47aecb6321fbacaade461f161c251
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1771967
Commit-Queue: Theresa  <twellington@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690966}

chrome/android/java/res/drawable/discover_card.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!--Copyright 2019 The Chromium Authors. All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:aapt="http://schemas.android.com/aapt" tools:targetApi="21" android:width="32dp" android:height="20dp" android:viewportWidth="32" android:viewportHeight="20">
-    <path android:pathData="M9 20h21c1.104 0 2-0.894 2-1.993V11.5S23.346 17.478 9 20z" android:strokeWidth="1" android:fillColor="#F68221" android:fillType="evenOdd"/>
-    <path android:pathData="M4.201 7H3.014v4h1.18c0.629 0 1.083-0.144 1.48-0.463 0.473-0.377 0.753-0.947 0.753-1.535C6.427 7.822 5.513 7 4.2 7zm0.945 3.004c-0.255 0.222-0.585 0.318-1.107 0.318H3.822V7.677H4.04c0.522 0 0.84 0.09 1.107 0.324 0.28 0.24 0.447 0.612 0.447 0.995 0.001 0.384-0.167 0.768-0.447 1.008zM6.799 7h0.809v4h-0.81zm2.787 1.54C9.1 8.366 8.958 8.252 8.958 8.035c0-0.253 0.253-0.445 0.602-0.445 0.242 0 0.442 0.096 0.653 0.325l0.423-0.536c-0.348-0.295-0.764-0.446-1.218-0.446-0.734 0-1.294 0.494-1.294 1.15 0 0.554 0.26 0.838 1.02 1.102 0.316 0.108 0.477 0.18 0.56 0.228 0.16 0.102 0.24 0.247 0.24 0.417 0 0.325-0.267 0.567-0.627 0.567-0.386 0-0.697-0.187-0.883-0.536l-0.522 0.488c0.373 0.53 0.82 0.764 1.435 0.764 0.84 0 1.43-0.54 1.43-1.319 0-0.638-0.273-0.926-1.192-1.253zm1.447 0.47c0 1.18 0.957 2.095 2.189 2.095 0.348 0 0.646-0.066 1.013-0.234V9.95c-0.323 0.313-0.61 0.44-0.976 0.44-0.814 0-1.393-0.573-1.393-1.386 0-0.77 0.597-1.379 1.356-1.379 0.385 0 0.677 0.133 1.013 0.452V7.155C13.88 6.981 13.588 6.91 13.241 6.91c-1.226 0-2.208 0.934-2.208 2.101zm9.615 0.688l-1.106-2.699h-0.883l1.76 4.12h0.435L22.644 7h-0.876z" android:strokeWidth="1" android:fillColor="#231F20" android:fillType="evenOdd"/>
-    <path android:pathData="M14.431 9.01a2.248 2.18 0 1 0 4.496 0 2.248 2.18 0 1 0-4.496 0z" android:strokeWidth="1" android:fillType="evenOdd">
-        <aapt:attr name="android:fillColor">
-            <gradient android:startY="7.4145775" android:startX="15.346851" android:endY="10.565744" android:endX="18.06089" android:type="linear">
-                <item android:offset="0" android:color="#FFE54B1A"/>
-                <item android:offset="1" android:color="#FFFBA025"/>
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path android:pathData="M14.431 9.01a2.248 2.18 0 1 0 4.496 0 2.248 2.18 0 1 0-4.496 0z" android:strokeWidth="1" android:fillColor="#000000" android:fillType="evenOdd"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:targetApi="21" android:width="32dp" android:height="20dp" android:viewportWidth="32" android:viewportHeight="20">
+    <path android:pathData="M3 1h26a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2z" android:strokeWidth="1" android:fillColor="#FFFFFF" android:fillType="evenOdd"/>
+    <path android:pathData="M9 19h20.997C30.551 19 31 18.553 31 18.004V11.5S22.722 16.774 9 19z" android:strokeWidth="1" android:fillColor="#F68221" android:fillType="evenOdd"/>
+    <path android:pathData="M4.201 7H3.014v4h1.18c0.629 0 1.083-0.144 1.48-0.463 0.473-0.377 0.753-0.947 0.753-1.535C6.427 7.822 5.513 7 4.2 7zm0.945 3.004c-0.255 0.222-0.585 0.318-1.107 0.318H3.822V7.677H4.04c0.522 0 0.84 0.09 1.107 0.324 0.28 0.24 0.447 0.612 0.447 0.995 0.001 0.384-0.167 0.768-0.447 1.008zM6.799 7h1v4h-1zm2.787 1.54C9.1 8.366 8.958 8.252 8.958 8.035c0-0.253 0.253-0.445 0.602-0.445 0.242 0 0.442 0.096 0.653 0.325l0.423-0.536c-0.348-0.295-0.764-0.446-1.218-0.446-0.734 0-1.294 0.494-1.294 1.15 0 0.554 0.26 0.838 1.02 1.102 0.316 0.108 0.477 0.18 0.56 0.228 0.16 0.102 0.24 0.247 0.24 0.417 0 0.325-0.267 0.567-0.627 0.567-0.386 0-0.697-0.187-0.883-0.536l-0.522 0.488c0.373 0.53 0.82 0.764 1.435 0.764 0.84 0 1.43-0.54 1.43-1.319 0-0.638-0.273-0.926-1.192-1.253zm1.447 0.47c0 1.18 0.957 2.095 2.189 2.095 0.348 0 0.646-0.066 1.013-0.234V9.95c-0.323 0.313-0.61 0.44-0.976 0.44-0.814 0-1.393-0.573-1.393-1.386 0-0.77 0.597-1.379 1.356-1.379 0.385 0 0.677 0.133 1.013 0.452V7.155C13.88 6.981 13.588 6.91 13.241 6.91c-1.226 0-2.208 0.934-2.208 2.101zm9.615 0.688l-1.106-2.699h-0.883l1.76 4.12h0.435L22.644 7h-0.876z" android:strokeWidth="1" android:fillColor="#231F20" android:fillType="evenOdd"/>
+    <path android:pathData="M14.431 9.01a2.248 2.18 0 1 0 4.496 0 2.248 2.18 0 1 0-4.496 0z" android:strokeWidth="1" android:fillColor="#F68221" android:fillType="evenOdd"/>
     <path android:pathData="M23.01 11h2.294v-0.678h-1.486v-1.08h1.43V8.566h-1.43V7.677h1.486V7H23.01zm5.496-2.82c0-0.748-0.535-1.18-1.467-1.18h-1.2v4h0.808V9.393h0.105L27.872 11h0.994l-1.305-1.685c0.61-0.12 0.945-0.522 0.945-1.134zm-1.622 0.66h-0.236V7.63h0.249c0.503 0 0.777 0.203 0.777 0.592 0 0.402-0.274 0.619-0.79 0.619z" android:strokeWidth="1" android:fillColor="#231F20" android:fillType="evenOdd"/>
-    <path android:pathData="M9 20h21c1.104 0 2-0.894 2-1.993V11.5S23.346 17.478 9 20z" android:strokeWidth="1" android:fillColor="#F68221" android:fillType="evenOdd"/>
-    <path android:pathData="M4.201 7H3.014v4h1.18c0.629 0 1.083-0.144 1.48-0.463 0.473-0.377 0.753-0.947 0.753-1.535C6.427 7.822 5.513 7 4.2 7zm0.945 3.004c-0.255 0.222-0.585 0.318-1.107 0.318H3.822V7.677H4.04c0.522 0 0.84 0.09 1.107 0.324 0.28 0.24 0.447 0.612 0.447 0.995 0.001 0.384-0.167 0.768-0.447 1.008zM6.799 7h0.809v4h-0.81zm2.787 1.54C9.1 8.366 8.958 8.252 8.958 8.035c0-0.253 0.253-0.445 0.602-0.445 0.242 0 0.442 0.096 0.653 0.325l0.423-0.536c-0.348-0.295-0.764-0.446-1.218-0.446-0.734 0-1.294 0.494-1.294 1.15 0 0.554 0.26 0.838 1.02 1.102 0.316 0.108 0.477 0.18 0.56 0.228 0.16 0.102 0.24 0.247 0.24 0.417 0 0.325-0.267 0.567-0.627 0.567-0.386 0-0.697-0.187-0.883-0.536l-0.522 0.488c0.373 0.53 0.82 0.764 1.435 0.764 0.84 0 1.43-0.54 1.43-1.319 0-0.638-0.273-0.926-1.192-1.253zm1.447 0.47c0 1.18 0.957 2.095 2.189 2.095 0.348 0 0.646-0.066 1.013-0.234V9.95c-0.323 0.313-0.61 0.44-0.976 0.44-0.814 0-1.393-0.573-1.393-1.386 0-0.77 0.597-1.379 1.356-1.379 0.385 0 0.677 0.133 1.013 0.452V7.155C13.88 6.981 13.588 6.91 13.241 6.91c-1.226 0-2.208 0.934-2.208 2.101zm9.615 0.688l-1.106-2.699h-0.883l1.76 4.12h0.435L22.644 7h-0.876z" android:strokeWidth="1" android:fillColor="#231F20" android:fillType="evenOdd"/>
-    <path android:pathData="M14.431 9.01a2.248 2.18 0 1 0 4.496 0 2.248 2.18 0 1 0-4.496 0z" android:strokeWidth="1" android:fillType="evenOdd">
-        <aapt:attr name="android:fillColor">
-            <gradient android:startY="7.4145775" android:startX="15.346851" android:endY="10.565744" android:endX="18.06089" android:type="linear">
-                <item android:offset="0" android:color="#FFE54B1A"/>
-                <item android:offset="1" android:color="#FFFBA025"/>
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path android:pathData="M14.431 9.01a2.248 2.18 0 1 0 4.496 0 2.248 2.18 0 1 0-4.496 0z" android:strokeWidth="1" android:fillColor="#000000" android:fillType="evenOdd"/>
+    <path android:pathData="M9 19h20.997C30.551 19 31 18.553 31 18.004V11.5S22.722 16.774 9 19z" android:strokeWidth="1" android:fillColor="#F68221" android:fillType="evenOdd"/>
+    <path android:pathData="M4.201 7H3.014v4h1.18c0.629 0 1.083-0.144 1.48-0.463 0.473-0.377 0.753-0.947 0.753-1.535C6.427 7.822 5.513 7 4.2 7zm0.945 3.004c-0.255 0.222-0.585 0.318-1.107 0.318H3.822V7.677H4.04c0.522 0 0.84 0.09 1.107 0.324 0.28 0.24 0.447 0.612 0.447 0.995 0.001 0.384-0.167 0.768-0.447 1.008zM6.799 7h1v4h-1zm2.787 1.54C9.1 8.366 8.958 8.252 8.958 8.035c0-0.253 0.253-0.445 0.602-0.445 0.242 0 0.442 0.096 0.653 0.325l0.423-0.536c-0.348-0.295-0.764-0.446-1.218-0.446-0.734 0-1.294 0.494-1.294 1.15 0 0.554 0.26 0.838 1.02 1.102 0.316 0.108 0.477 0.18 0.56 0.228 0.16 0.102 0.24 0.247 0.24 0.417 0 0.325-0.267 0.567-0.627 0.567-0.386 0-0.697-0.187-0.883-0.536l-0.522 0.488c0.373 0.53 0.82 0.764 1.435 0.764 0.84 0 1.43-0.54 1.43-1.319 0-0.638-0.273-0.926-1.192-1.253zm1.447 0.47c0 1.18 0.957 2.095 2.189 2.095 0.348 0 0.646-0.066 1.013-0.234V9.95c-0.323 0.313-0.61 0.44-0.976 0.44-0.814 0-1.393-0.573-1.393-1.386 0-0.77 0.597-1.379 1.356-1.379 0.385 0 0.677 0.133 1.013 0.452V7.155C13.88 6.981 13.588 6.91 13.241 6.91c-1.226 0-2.208 0.934-2.208 2.101zm9.615 0.688l-1.106-2.699h-0.883l1.76 4.12h0.435L22.644 7h-0.876z" android:strokeWidth="1" android:fillColor="#231F20" android:fillType="evenOdd"/>
+    <path android:pathData="M14.431 9.01a2.248 2.18 0 1 0 4.496 0 2.248 2.18 0 1 0-4.496 0z" android:strokeWidth="1" android:fillColor="#F68221" android:fillType="evenOdd"/>
     <path android:pathData="M23.01 11h2.294v-0.678h-1.486v-1.08h1.43V8.566h-1.43V7.677h1.486V7H23.01zm5.496-2.82c0-0.748-0.535-1.18-1.467-1.18h-1.2v4h0.808V9.393h0.105L27.872 11h0.994l-1.305-1.685c0.61-0.12 0.945-0.522 0.945-1.134zm-1.622 0.66h-0.236V7.63h0.249c0.503 0 0.777 0.203 0.777 0.592 0 0.402-0.274 0.619-0.79 0.619z" android:strokeWidth="1" android:fillColor="#231F20" android:fillType="evenOdd"/>
 </vector>

chrome/android/java/res/drawable/elo_card.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!--Copyright 2019 The Chromium Authors. All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:targetApi="21" android:width="32dp" android:height="20dp" android:viewportWidth="32" android:viewportHeight="20">
+    <path android:pathData="M3 1h26a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2z" android:strokeWidth="1" android:fillColor="#FFFFFF" android:fillType="evenOdd"/>
     <path android:pathData="M9 10c0-3.867 3.134-7 7-7s7 3.133 7 7-3.134 7-7 7-7-3.133-7-7" android:strokeWidth="1" android:fillColor="#000000" android:fillType="evenOdd"/>
     <path android:pathData="M13.87 10.85c-0.216 0.213-0.511 0.341-0.836 0.337-0.224-0.004-0.43-0.07-0.606-0.182l-0.436 0.694c0.298 0.189 0.65 0.3 1.03 0.307 0.552 0.008 1.055-0.21 1.421-0.568l-0.572-0.587zm-1.984-0.713c-0.005-0.046-0.008-0.094-0.007-0.142 0.01-0.648 0.544-1.165 1.191-1.154 0.353 0.005 0.666 0.166 0.877 0.416l-2.061 0.88zm1.196-2.116c-1.1-0.017-2.005 0.862-2.021 1.962-0.007 0.412 0.112 0.797 0.322 1.118l3.608-1.543c-0.203-0.869-0.976-1.522-1.91-1.537zm3.04-0.898v3.847l0.668 0.277-0.316 0.758-0.66-0.274c-0.148-0.064-0.249-0.162-0.325-0.273-0.073-0.113-0.128-0.268-0.128-0.477V7.123h0.761z" android:strokeWidth="1" android:fillColor="#FFFFFF" android:fillType="evenOdd"/>
     <path android:pathData="M18.128 10.897c-0.225-0.214-0.402-0.55-0.402-0.883 0-0.351 0.157-0.663 0.4-0.878L17.58 8.522c-0.412 0.365-0.673 0.897-0.673 1.492 0 0.602 0.268 1.14 0.69 1.506l0.532-0.623" android:strokeWidth="1" android:fillColor="#00A6E0" android:fillType="evenOdd"/>

chrome/android/java/res/drawable/mir_card.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!--Copyright 2019 The Chromium Authors. All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:aapt="http://schemas.android.com/aapt" tools:targetApi="21" android:width="32dp" android:height="20dp" android:viewportWidth="32" android:viewportHeight="20">
-    <path android:pathData="M8.714 7.443C8.88 6.885 9.414 6.5 10.019 6.5h2.328v7H10.02V9.405c0-0.1-0.148-0.122-0.18-0.026L8.48 13.5H6.868l-1.36-4.121c-0.032-0.096-0.18-0.075-0.18 0.026V13.5H3v-7h2.328c0.606 0 1.138 0.385 1.305 0.943l0.952 3.187c0.025 0.085 0.152 0.085 0.177 0l0.952-3.187zM18.678 6.5h1.97v7H18.32V9.254c0-0.096-0.136-0.123-0.176-0.036l-1.622 3.535c-0.208 0.454-0.677 0.747-1.195 0.747h-1.97v-7h2.328v4.025c0 0.095 0.135 0.123 0.176 0.037l1.6-3.315C17.68 6.79 18.154 6.5 18.677 6.5zm2.98 3.226h7.13c-0.355 0.899-1.262 1.538-2.325 1.538h-2.477V13.5h-2.328V9.726z" android:strokeWidth="1" android:fillColor="#3BA536" android:fillType="evenOdd"/>
-    <path android:pathData="M26.463 6.5h-5.108c0.18 1.62 1.61 2.882 3.347 2.882h4.192c0.036-0.161 0.055-0.328 0.055-0.5 0-1.316-1.113-2.382-2.486-2.382" android:strokeWidth="1" android:fillType="evenOdd">
-        <aapt:attr name="android:fillColor">
-            <gradient android:startY="6.8339853" android:startX="21.3552" android:endY="6.8339853" android:endX="28.9491" android:type="linear">
-                <item android:offset="0" android:color="#FF00A5D8"/>
-                <item android:offset="1" android:color="#FF007DC0"/>
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path android:pathData="M8.714 7.443C8.88 6.885 9.414 6.5 10.019 6.5h2.328v7H10.02V9.405c0-0.1-0.148-0.122-0.18-0.026L8.48 13.5H6.868l-1.36-4.121c-0.032-0.096-0.18-0.075-0.18 0.026V13.5H3v-7h2.328c0.606 0 1.138 0.385 1.305 0.943l0.952 3.187c0.025 0.085 0.152 0.085 0.177 0l0.952-3.187zM18.678 6.5h1.97v7H18.32V9.254c0-0.096-0.136-0.123-0.176-0.036l-1.622 3.535c-0.208 0.454-0.677 0.747-1.195 0.747h-1.97v-7h2.328v4.025c0 0.095 0.135 0.123 0.176 0.037l1.6-3.315C17.68 6.79 18.154 6.5 18.677 6.5zm2.98 3.226h7.13c-0.355 0.899-1.262 1.538-2.325 1.538h-2.477V13.5h-2.328V9.726z" android:strokeWidth="1" android:fillColor="#3BA536" android:fillType="evenOdd"/>
-    <path android:pathData="M26.463 6.5h-5.108c0.18 1.62 1.61 2.882 3.347 2.882h4.192c0.036-0.161 0.055-0.328 0.055-0.5 0-1.316-1.113-2.382-2.486-2.382" android:strokeWidth="1" android:fillType="evenOdd">
-        <aapt:attr name="android:fillColor">
-            <gradient android:startY="6.8339853" android:startX="21.3552" android:endY="6.8339853" android:endX="28.9491" android:type="linear">
-                <item android:offset="0" android:color="#FF00A5D8"/>
-                <item android:offset="1" android:color="#FF007DC0"/>
-            </gradient>
-        </aapt:attr>
-    </path>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:targetApi="21" android:width="32dp" android:height="20dp" android:viewportWidth="32" android:viewportHeight="20">
+    <path android:pathData="M5.328 6.5l0.138 0.007c0.502 0.049 0.935 0.362 1.122 0.81l0.045 0.126 0.952 3.187c0.021 0.071 0.112 0.083 0.157 0.035l0.02-0.035 0.952-3.187C8.868 6.928 9.334 6.56 9.88 6.507L10.019 6.5h2.328v7H10.02V9.405c0-0.086-0.109-0.115-0.16-0.06L9.84 9.379 8.48 13.5H6.868l-1.36-4.121C5.48 9.296 5.368 9.3 5.336 9.367L5.328 9.405V13.5H3v-7h2.328zm10.357 0v4.025c0 0.079 0.094 0.112 0.149 0.07l0.027-0.033 1.6-3.315c0.199-0.414 0.61-0.693 1.076-0.74L18.678 6.5h1.97v7H18.32V9.254c0-0.082-0.1-0.114-0.154-0.067l-0.022 0.031-1.622 3.535c-0.19 0.412-0.594 0.692-1.055 0.74l-0.14 0.007h-1.97v-7h2.328zm13.103 3.226c-0.355 0.899-1.262 1.538-2.325 1.538h-2.477V13.5h-2.328V9.726z" android:strokeWidth="1" android:fillColor="#3BA536" android:fillType="evenOdd"/>
+    <path android:pathData="M26.463 6.5h-5.108c0.18 1.62 1.61 2.882 3.347 2.882h4.192c0.036-0.161 0.055-0.328 0.055-0.5 0-1.316-1.113-2.382-2.486-2.382" android:strokeWidth="1" android:fillColor="#0093D3" android:fillType="evenOdd"/>
+    <path android:pathData="M3 1h26a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2z" android:strokeWidth="1" android:fillColor="#FFFFFF" android:fillType="evenOdd"/>
+    <path android:pathData="M5.328 6.5l0.138 0.007c0.502 0.049 0.935 0.362 1.122 0.81l0.045 0.126 0.952 3.187c0.021 0.071 0.112 0.083 0.157 0.035l0.02-0.035 0.952-3.187C8.868 6.928 9.334 6.56 9.88 6.507L10.019 6.5h2.328v7H10.02V9.405c0-0.086-0.109-0.115-0.16-0.06L9.84 9.379 8.48 13.5H6.868l-1.36-4.121C5.48 9.296 5.368 9.3 5.336 9.367L5.328 9.405V13.5H3v-7h2.328zm10.357 0v4.025c0 0.079 0.094 0.112 0.149 0.07l0.027-0.033 1.6-3.315c0.199-0.414 0.61-0.693 1.076-0.74L18.678 6.5h1.97v7H18.32V9.254c0-0.082-0.1-0.114-0.154-0.067l-0.022 0.031-1.622 3.535c-0.19 0.412-0.594 0.692-1.055 0.74l-0.14 0.007h-1.97v-7h2.328zm13.103 3.226c-0.355 0.899-1.262 1.538-2.325 1.538h-2.477V13.5h-2.328V9.726z" android:strokeWidth="1" android:fillColor="#3BA536" android:fillType="evenOdd"/>
+    <path android:pathData="M26.463 6.5h-5.108c0.18 1.62 1.61 2.882 3.347 2.882h4.192c0.036-0.161 0.055-0.328 0.055-0.5 0-1.316-1.113-2.382-2.486-2.382" android:strokeWidth="1" android:fillColor="#0093D3" android:fillType="evenOdd"/>
 </vector>

chrome/android/java/res/drawable/visa_card.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!--Copyright 2019 The Chromium Authors. All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:targetApi="21" android:width="32dp" android:height="20dp" android:viewportWidth="32" android:viewportHeight="20">
+    <path android:pathData="M3 1h26a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2z" android:strokeWidth="1" android:fillColor="#FFFFFF" android:fillType="evenOdd"/>
     <path android:pathData="M15.873 5.996l-1.737 7.999h-2.1l1.736-7.999h2.101zm8.84 5.166l1.106-3.005 0.636 3.005h-1.742zm2.344 2.833H29l-1.695-7.999h-1.794c-0.403 0-0.745 0.23-0.894 0.587l-3.152 7.412h2.205l0.44-1.193h2.694l0.253 1.193zm-5.482-2.611c0.008-2.113-2.965-2.228-2.945-3.17 0.006-0.29 0.285-0.593 0.891-0.671 0.3-0.038 1.13-0.07 2.072 0.357l0.368-1.695c-0.505-0.182-1.156-0.355-1.964-0.355-2.076 0-3.539 1.087-3.551 2.646-0.014 1.149 1.042 1.791 1.84 2.174 0.818 0.393 1.092 0.645 1.09 0.995-0.006 0.537-0.654 0.772-1.256 0.781-1.057 0.018-1.67-0.28-2.16-0.503l-0.38 1.75c0.49 0.224 1.396 0.417 2.337 0.427 2.206 0 3.649-1.073 3.657-2.736zM9.47 13.993H7.248L5.573 7.612C5.47 7.218 5.38 7.074 5.073 6.909 4.567 6.639 3.733 6.385 3 6.227l0.05-0.23h3.575c0.456 0 0.865 0.297 0.97 0.815l0.883 4.628 2.187-5.444h2.207L9.47 13.995z" android:strokeWidth="1" android:fillColor="#10347E" android:fillType="evenOdd"/>
     <path android:pathData="M15.873 5.996l-1.737 7.999h-2.1l1.736-7.999h2.101zm8.84 5.166l1.106-3.005 0.636 3.005h-1.742zm2.344 2.833H29l-1.695-7.999h-1.794c-0.403 0-0.745 0.23-0.894 0.587l-3.152 7.412h2.205l0.44-1.193h2.694l0.253 1.193zm-5.482-2.611c0.008-2.113-2.965-2.228-2.945-3.17 0.006-0.29 0.285-0.593 0.891-0.671 0.3-0.038 1.13-0.07 2.072 0.357l0.368-1.695c-0.505-0.182-1.156-0.355-1.964-0.355-2.076 0-3.539 1.087-3.551 2.646-0.014 1.149 1.042 1.791 1.84 2.174 0.818 0.393 1.092 0.645 1.09 0.995-0.006 0.537-0.654 0.772-1.256 0.781-1.057 0.018-1.67-0.28-2.16-0.503l-0.38 1.75c0.49 0.224 1.396 0.417 2.337 0.427 2.206 0 3.649-1.073 3.657-2.736zM9.47 13.993H7.248L5.573 7.612C5.47 7.218 5.38 7.074 5.073 6.909 4.567 6.639 3.733 6.385 3 6.227l0.05-0.23h3.575c0.456 0 0.865 0.297 0.97 0.815l0.883 4.628 2.187-5.444h2.207L9.47 13.995z" android:strokeWidth="1" android:fillColor="#10347E" android:fillType="evenOdd"/>
 </vector>

components/test/data/payments/render_tests/PaymentRequestFreeShippingTest.NightModeDisabled-free_shipping.Nexus_5-19.png.sha1

-8b000d03734707f79de4b325bb4c934267fb4766
+73e69eaee3489a12f8c46550e947521654225459
\ No newline at end of file

components/test/data/payments/render_tests/PaymentRequestFreeShippingTest.NightModeEnabled-free_shipping.Nexus_5-19.png.sha1

-e1438bd6c2f22115f6eefdde1aa5f9d2f88cc1d9
+136ca43e8819cff48ee62fd4386471137c958331
\ No newline at end of file