[automerger skipped] Merge "Use String in CaptivePortalData underlying types" am: 13d7d5cd am: 061a4f93 am: 04ca7708 -s ours am: 9dd7f6da -s ours

am skip reason: skip tag Change-Id Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97 with SHA-1 8d3d5456 is already in history

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

Change-Id: I2c8c4ed13e188e97c1a81b6f279d67703ba62949