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

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

Change-Id: If054ef1739a273e4a203be44675d3b410784dedf
tree: 323c071984b5f97bd5545e40ed30cc7a48c5a823
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING