Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" am: d806079674 am: 92884ae4ce

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib62b14620dd2aa880bca086d7144b05e088d236d

tests/net/common/java/android/net/CaptivePortalDataTest.kt

@@ -58,7 +58,8 @@ class CaptivePortalDataTest {
 
     @Test
     fun testParcelUnparcel() {
-        assertParcelSane(data, fieldCount = 8)
+        val fieldCount = if (SdkLevel.isAtLeastS()) 8 else 7
+        assertParcelSane(data, fieldCount)
 
         assertParcelingIsLossless(makeBuilder().setUserPortalUrl(null).build())
         assertParcelingIsLossless(makeBuilder().setVenueInfoUrl(null).build())