Merge "Fix CaptivePortalDataTest on R-" am: 4064d2da92 am: f748a34659

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b27d1f6924406ee7466c5c2316240d11f819a6b