Merge "Use String in CaptivePortalData underlying types" am: 55d93ddb7e am: dae21e8596

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

Change-Id: I6a1cf633329d2b3cb90a0ea68e946777f9feff89
tree: 7341e4004b95a068d027c637df36f325b9db9063
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING