[Payments] fix the bug which disappear card icon list.

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/ExpandableGridView.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ui/ExpandableGridView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/ExpandableGridView.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/ExpandableGridView.java
index 5cacde5b6af84a40cce213764dbde1447767ac66..28cc6f47e1e3cb6a84332411c4dfa9e89d767aec 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/ExpandableGridView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/ExpandableGridView.java
@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.payments.ui;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.GridView;
 
 /**
@@ -22,10 +23,10 @@ public class ExpandableGridView extends GridView {
         // GridView does not work well in a ScrollView when it uses WRAP_CONTENT.
         // Instead, force it to use AT_MOST.
         // https://stackoverflow.com/questions/4523609/grid-of-images-inside-scrollview
-        final int heightSize = MeasureSpec.getSize(heightMeasureSpec);
         int heightSpec;
         if (getLayoutParams().height == LayoutParams.WRAP_CONTENT) {
-            heightSpec = MeasureSpec.makeMeasureSpec(heightSize, MeasureSpec.AT_MOST);
+            heightSpec = MeasureSpec.makeMeasureSpec(
+                    Integer.MAX_VALUE & View.MEASURED_SIZE_MASK, MeasureSpec.AT_MOST);
         } else {
             heightSpec = heightMeasureSpec;
         }