Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" am: caa5817c33 am: a8a4a46077

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib62b14620dd2aa880bca086d7144b05e088d236d