Merge "Use String in CaptivePortalData underlying types" am: 13d7d5cde6 am: 061a4f93c0

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

Change-Id: I6a1cf633329d2b3cb90a0ea68e946777f9feff89