Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: 47157e7711 am: 4bdea2a29b

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

Change-Id: I5c04566c379e2cad164d55050ffdc9152432dfd3