Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: 33457035e7

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

Change-Id: I26db95ad9d91dec40a62b7e4c4c0b77133ddb5d3