Merge "Use String in CaptivePortalData underlying types" am: 4e34417eec am: e9aecbb5d2

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

Change-Id: I6a1cf633329d2b3cb90a0ea68e946777f9feff89