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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74a6492618ca1e21e35474c012dee9886239e75a